More refactoring for the CNAF analysis machine.