Optimize imports

Fixes #1133.
Remove parens