Database: issue #98; first try at streamlining connect()