- code cleanup
- fix to ProxyMaker: all overridden methods should use erased parameter types.