OK, I understand this is mostly not your code. Just thought we could boyscout the codebase a bit while we're at it. I'm fine with doing it later if you prefer.

Invalid values in Redis shouldn't leak into this since this is a new strategy.