Cleanup and simplify formatter logic.

Andy Marquisrequested to merge
issue/custom_field-3496708:3496708-formatter-wrapper-tags into 3.0.x

Closes #3496708

Merge request reports