Code cleanup and fixes (review from xerial)
Code cleanup and fixes (review from xerial)

paramvir-b/sqlite-jdbc,paramvir-b/sqlite-jdbc,xerial/sqlite-jdbc,xerial/sqlite-jdbc,xerial/sqlite-jdbc,paramvir-b/sqlite-jdbc,paramvir-b/sqlite-jdbc,xerial/sqlite-jdbc