MethodDiscoveryTour: added methodDepth to handle situations where a method appears inside another.
Various changes.
Various changes