Feedback from Hans on r213815. No functionaility change.