Cleanups and improvements. Use more of DBAL's convenience features.