Hmmm...yeah, lemme think about that. May do that in a different PR, though, across the board.