MFC: r267185

Minor improvements.