Merge pull request #1525 from alex/style-fix

A handful of style fixes for the bindings