DCOM-96 compliance - proxy generation as of doctrine/common
fixed refactoring issues