Move away from the deprecated Zero and One traits