Take fixphi into account when fixing the phi and varphi characters.  Issue #353.
Merge branch 'issue353' into develop.  Issue #353.