Improved HarmonicFieldPitchMaker.
Removed two classes.