Splitting grammar resolver helper methods into regular and clean variants