Minor refactoring in prep for more major changes

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-781@1545932 13f79535-47bb-0310-9956-ffa450edef68