Renamed macro in fibheap, finished V2 of heap_cache