IFDEFd some of those ASM blocks I mentioned in the last commit