Per Tim Starling, fixes for r58061: