I notice that we have two extensions to do function plotting: old "wavy" and new "function plotter". Johan, since you added the latter, please clean this up by removing one of them (make sure no functionality is lost!).