Fix namespace versioning and remove __detail::__identity helpers