Use a function over a closure to handle poor inference

Use a function over a closure to handle poor inference #276