Fix parsing of identifier names for good.

Also fix #13.