Fix parser.
Fix the fix.
Update doc and cleanup.