Clean up the api for address_space a bit. Compiles now.