Fix whitespace problems. Bug 727122
Fix TODO to use utf8. Bug 727122