Grapher: cleanup/issue fix for master merge