Parsing tweaks.

Mostly strictness control.