I think we should use [`utils.infer_addr_type`](http://vumi-jssandbox-toolkit.readthedocs.org/en/release-0.2.x/utils.html#infer_addr_type) here. It will need praekelt/vumi-jssandbox-toolkit#170 though. Are you okay with that happening first?