Merged thread safety at AddressSpace + code style fixes.