More template changes.

The speed difference is totally negligible, and shouldn't really be relevant when you consider that you're butchering this file :)