Merge "Move tag type comments where they belong."