More: parse mappings; rework error handling; flesh out cleanup.