Relax some over-zealous constification that gave some lhash-based code no