Grammar fixes for #1301