Now heapsort using swap and lt functions (as opposed as inlined code) is faster than the original.