[LRall] Updating GRC step defs with helper methods