Speed up picking of killers

Changing the order of the conditions gives
about 1% speed up!

No functional change.
Merge branch 'master' into closed_position_minors