SC op cleanup, and add various missing ones.