Added (partially) line numbers. Improved error handling. Adjusted syntax to best match spec-rationale. All tests pass now. Still TODO and FIXME remaining though!
Mother of all conflicts on my end. :-(