Remove/modify superfluous functions
Merge pull request #7028 from wmtan/RemoveSuperfluousFunctions

Remove/modify superfluous member functions of FunctionWithDict.