OK, I tried a few things, but something that I think might need some attention: UFCS is very problematic with this. https://gist.github.com/6198938b9c6d40a53ca1