Some refactoring of the Builder and WhileyProject.