FIX: multiple parse's OPT fixes.
FEAT: minor parse code improvements.