Compiler code cleanup (renamed several internal predicates for clarity)