Comment 1 for bug 1884261

Not marking this as a duplicate of bug 2050227 because of the mention of fields that lack labels, but the proposed patches for that bug address various cleanup issues.