General cleanup.

Shuffled code around to make things more readable and improved
function and variable naming.
Make the "unmapped mate flag" fixup code unconditional again.

The bug hasn't been fixed in TopHat 2.0.9 after all.