A bit of program simplification from r185056