Made parser resort to canonical names for functions.
More canonicalizing.
Updated tests to reflect parsetree node canonicalization.
Fixed field rules
Added another function to canonical forms.
Added another canonical function form.