Some more comment cleaning.