A couple small cleanups, just making sure you can either pass in a whole new mapper to the query, or you can pass it directly into the select / update methods.