Precision: r58138 was part 2a/3 of my changes.