Reduce scope of some variables
Sprinke some UNLIKELY() macros