Yeah, :+1:. If you always return a function from this code, then the code everywhere else gets simpler.