Cleaned up and changed basic header layouts for SetOps.