* [SC] Minor cleanup towards more DCG use.