Merge "Fixed use of __METHOD__ in a closure."