Further refinements for r112836 and r112853.