Improved code generation for intermediate steps. Now generates using @= on the approprate initializers.