Complete switch-over to builder style code generation.