Refactor to evade a bug in pychecker.