Stay more in line with PDDL