1. Turns out you can use bare ':' in cell array subscripts too.

2. Command statement detection is wonky.  It was taking a bare "figure" on a line and jamming it with the next line.  Fixed this case by adding explicit recognition of some commands, but this is a losing battle and we'll need a more general fix to the grammar.