Speed up picking of killers

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

No functional change.
Merge remote-tracking branch 'upstream/master'