Since this bug has already been marked "koi+", I want to avoid using it for general refactoring. That said, I'm not sure this isn't necessary to support the bug. @tafsiri lets talk about how this change might be simplified