Enforce the type of nestingDepth
Fix for review
Remove reference to undefined
Merge branch 'michel_2384_expr' into next