Edit comments so they align with our C-- spec