Avoid infinite loops in \mathchoice Get() calls.  Resolves problems reported in issue #373.
Merge branch 'issue373' into develop

Resolves issue #373.