Restore preprocess_expression to match form preprocess.

Some minor edits and comments in form preprocess along the way.