s3-dbwrap: use wrappers where appropriate