Handle more cases in the heap lints