Tidy up and type-hint the database engine modules.