Fixes to problems revealed by actually running with Coveralls.