more refactoring an cleanup

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1583148 13f79535-47bb-0310-9956-ffa450edef68