Refactor metavar formatting more.