Revert to using lists for grammar