2370-small-style-fixes

This fixes a number of small issues described in:
https://issues.apache.org/jira/browse/COUCHDB-2370

Closes COUCHDB-2370