Add more heap variants experimented with earlier. 5-ary heap is still
buggy though. Previously 2-4-ary heap was best.