Fix #193 - Use the new grammar map API

This can be released as a **PATCH** level release.