per our discussion on irc, I'll plan on cleaning this up in a future pr.