Do this, we'll merge it (maybe into `2-14-maintenance` if others agree too), and if you feel like making it take a block to match args as another PR that'd be awesome :)