Nevermind. I remember what the whole point in this set of changes was now, and the switch to any makes some sense. 
Maybe instead write a custom matcher that actually checks something about the values passed to make sure they look like we expect?