support for new CBMC and refactorings