Further simplify how we construct our data in DBAPI

This is a result of Oleg's feedback on pull request #2