Curry should always call with context

+ a little bit of cleanup