Fix compiletest merge issues.