Switched back to delete-trailing-whitespace.

whitespace-cleanup was acting wonky again.