Previously, we did not test for the storage being actually freed and
freeing only happened for passes, either explicit or a hit on hfm or
hfp, but not the for the object becoming the hfm/hfp.

We now handle incremental freeing for hfm/hfp as for private objects and
add a test which actually checks that storage is being freed on the go.

Fixes #2653