Correct preprocess function names.
Get rid of unused global variables.
Merge pull request #101 from adam-vessey/7.x

Correct preprocess function names.