Made the parser for dictionary entries more robust.

This addresses the cases that Thierry brought up in issue #13.