further simplify abr_parser and co