Allow ODBC storage to be queried with multiple mailboxes, and remove multiple goto's.