Fixed clashing with builtin stmts