Minor simplification of the subclass instrumentation context delegate with additional improvement of the test coverage.