Added two overrides for fields: No cruft in the output HTML.