yet more comment cleanup...