Correct the grammar such that we can parse if there is structured dat…

[ottobackwards]

…a but no message. Originally this was supported, or intended to be supported, but in practice it did not work.