Minor compiler code refactoring (renamed flags) and cleanup