scd: minor cleanup to merge other works.