Refactor out generic mbr

BTW there is a trailing `,`