further refactoring and bug fix introduced with previous refactoring

git-svn-id: https://svn.sosy-lab.org/software/cpachecker/trunk@14262 4712c6d2-40bb-43ae-aa4b-fec3f1bdfe4c