Minor cleanups for SSKs.