Use new shared rax_to_dict and normalize the services key into something that makes sense