Slight performance tweak for HaarSurroundFeature

Might not make a big performance difference, but a colleague suggested these when I was getting help understanding the code...