Small CS cleanups