Wip sip23 √

Wow, that's much more concise.