It's clearer what's happening now (though, honestly, it seems like the
whole thing is much more complicated than it needs to be).