Heh, refactoring the code that drives Azure table storage is challenging.