Whitespace and import fixes from Eclipse.