@mhvk - in this case, I think that with @mdboom's comment, the optimization is simple enough that it's fine to leave it in. The issue with the storage one is that (while nifty) in my view it made the code a lot harder to understand (even with a comment) so I'd rather leave it for later. It should be easy to re-apply the changes in future if we decide to! (and if benchmarks show it makes a big difference).