@pdehaan - I'd say go with explicit versions, in a separate PR?