Use correct error string.
Better error messages.
Remove 'internal' from addrspace.
Cleanup.
Merge branch 'branch' into new_master