MFC of r260691:
 - Fix indent.
 - Minor clean up after DB5 migration.