Corrected problem with circular references in class/interface types