Tweaks to Stpboth.

Make sure we aren't running over threads and don't do ZCx=0 if not in ZC
mode.