Move all address space definitions to Defs to make sure they aren't redefined