Some disagreement here still, resolved offline with @dkillick leading to upcoming proposals ...