Backported comments fixes.