Making `object` a separate arg is *so much* clearer than the stuff we had before.  Not sure why I didn't think of it.  Nice work!