: Impedance matching

As promised, I went through my patch set and isolated the sections which overlap with recent changes made to the TFRC/CCID3 code.

With this patch, all the new functionality becomes available. I have cross-checked it this against the old variant and it works fine.