Cleaner diagnostics parser - Fixes #25