More tweaks (mostly removing defs of scc-vs, and SCC).