Apply #11's diff, trim whitespace on empty lines