simplify bucket search loops

[BenFradella]

Do the bucket search loops that start at pos and loop back through the start in a single loop, rather than being broken out into pairs of identical loops.

This does actually fix a bug. Lines 1394,1395 were missing from the second loop, so the temp key was only set if we found a match in the first loop. I kept the contents of the first loop and deleted the second, so the temp key will get set for any position in the bucket now.