Removed a few #ifndef JLR/#endif pairs because they're not needed.