Fix #193 - Use the new grammar map API