Added grammar support for single keyword messages within multi keyword
messages.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>