Refactorings for NVPR and SVGAnnotation