Fix names for constructed expressions.
Don't simplify variable names over the top of parameter names, or vice versa.
Add a wrapper simplify_names( ).
Use simplified names in writing out call graph.
Simplify some more names.