Worth splitting onto multiple lines for clearer diffs?