Fix usage of address space identifiers