Fix backport: closure param type inference doesn't exist on 2.2.X