Rework handling of :ensure with a version