Cleaned up Ginger grammar specification