Clean up the compiler a little bit