Whitespace + accessibility changes to exactly match the target branch to make our diff tools happy