Minor changes suggesgted by Re#.