Compile-time check for JDBC4 api (to avoid accidental build against earlier APIs; some minor fixes to AfterCloseComboPooledDataSource; some code cleanup.