Fix up a heap of code-style issues.

Fixes #300