Revert "A few addrspace changes to syntax"

This reverts commit 9ec0afd6dd007d03d1268550a6860ad0dca83ae1.