Constant initializer codegen refactoring

Preparation for the 2.063 merge, just here for the test suite.