More code cleanups and preparations for more branch detection heuristics.