Fixes. New bug described in spidercrab.py:705.