Yet more pychecker fixes.