Second version, include changes from the phpcs output.