Edits from C.