Moving to using Features to handle content type installation process. That way we have less weird clunky code, and more reliable install / uninstall. Sites on 7.x-1.2 are already on the same content structure, Features will just help keep track of it all.