Ah right. Most of this should all go away when moving to a template-centric approach. I wouldn't worry about this now.