Increment expansion depth limit after expanding again
More descriptive method names in ContextSensitiveParser