RR: more refinements to finaliser.