Rename variable in Closure.
Fix test for HHVM.
Merge branch '4.0'