Clean up related to the fix in scoping of nested functions.