Greatly simplified grammar :)