This should get rid of the #ifdefs surround the alloc_remap() calls. 
Compiles on non-discontig i386.