NOREF: Cleaning up some overzealous changes