Improved scoped proxy generator and code coverage.