Update: Line endings fixes. We don't have phpcs configured for 1.8, and GH makes it hard to see line ending changes, so these are slipping in.