Added support for a few more grammar rules.