Multiple edits to bring in line with CM.