Finish making compatible with quartz-1.0-RC4 (i.e. Quartz 2)