s3:messages: convert to use only dbwrap wrapper functions