More debug code moving.