Changed draw-curve signature, added define-brush mega-macro