This includes freqmod's fixes provided in pull request/issue #57, in addition to some other misc. cleanup items noted while reviewing the aforementioned changset.