* Move the ip provider definitions into their own file.
* Use the new macros which let us make use of translated types.