Minor cleanups from code relocation