```
<lifeless> the code is functional without this patch, its just being naughty and storing those things on the decorated result rather than internally
```

I see that this code is indeed tested, and that this is pretty much just an implementation detail. While reviewing the file, I've noticed other issues, but they go beyond the scope of this patch. 

LGTM.