Add layer of indirection for parser rules from lop
Revert "Add layer of indirection for parser rules from lop"

This reverts commit 02bc080b643ae066dc902622cef4643cf693d7e2.