Optigraph

Fixed error that commit had previously introduced into CPP codegen,  Should *hopefully* pass tests on jenkins now.