(cleanup) Cleanup and reform API.
(doc) Documented parser.