AST generation: fix handling of separation classes