Speed up a little more

Remove another comparative instruction, and reorder for more efficiency.