To allow for better performance. Have taken what a user contributed
and tried to make it even more efficient still.

behatnotneeded - existing tests should take care of this

Change-Id: I91ff4e0b5e3e4e22ee437cce5e3da33bace1e736
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>