Started fixing ast_predicates