Compiler cleanups, part j