Fix scoping issue with the hidden comment type field.