Hopefully the final GSA commit. Adjusted grammar expansion rules.