Makes DboSource less string dependent.
Merge pull request #2178 from Phally/master-dbosource

Makes DboSource less string dependent.