Ack. There's also a lot of inconsistency there. I'll try to remember to address that on some point. A bit out of scope for this PR.