Further simplify r200797 and add an explanatory comment.