One more round of cleanup

Another round of cleanup for the initial implementation of
AssignOutAndRefParametersLazily
Address conflicts