performChannelScan was restored as protected non-virtual but upstream declares it public virtual — match upstream verbatim so the hunk disappears from the merge surface. Also replace the bare 'extra > 5' tail threshold with COM_PREFS_TAIL_BYTES, tied by comment to the trailing writes in savePrefs(), so the next upstream field append updates one named constant.