Merge the two pieces from Graphics
Remove ref to schema.macros from ns

Also fix some silly compiler bugs