Wip sip23 √

@phaller Absolutely, but I think it will be hard to write tests that verify that it is easy to follow the contract :)