Modify grammar to reduce some use before declaration, plus some renames
Shorten error messages