Compiler suggested cleanups