Yet more comment cleanup