I'm not sure where the # afs-16P came from, as my notes go back to 87. I rechecked my maintenance records and found that you're right the original was afs-20. I did try an afs-22 at one time because my friend's GNX came with one. Switched back after a month since there was no gain in horsepower (ha, ha).
Happy Holidays
Dennis