Terry parser fixes.

Fixes #128