@robertkluin I've thought about it and I think this is as good as it's going to be. 

In any case where we need to sidestep this functionality, then we should make it purposely hard/ugly and this handles that just fine.

I'm gonna go ahead and pull this into my branch then we can do a final lookover then.