Untested changes for implementing the method analyzer.