Fix for the parser.

    See the unit tests.