Changed the USER_HEAP_* macros to use HANDLEs instead of HANDLE16s.