I think this is more about my editor removing trailing whitespace; I'll revert the file and see if that minimizes the review churn.