Since I couldn't prove Joe wrong, settle for a refactor