Add some missing imports, delete whitespace, a=chris