Adjust to external `database_api` package usage, and fix mypy issues