More minor cleanup. Add another update().
Fix DS-1408 based on hints at http://stackoverflow.com/questions/4162557/timeout-error-trying-to-lock-table-in-h2