Cleaned up some in SAT.