Codegen compiler arg processing changes after merge with master