Moving make_immutable to end of file; cleaning up some auto-generated cruft