Remove trailing semicolons.
Fix some interface types.

Also remove a few unused imports.