Merged comment cleanup (forgot this before).