Sweep to master: Convert flavor tagging labeling tools to decorators
This is just !56671 (merged) with the fix in !56842 (merged) applied on top. Some things went wrong sweeping to master
(!56793 (merged)), so I'm manually cherry picking them both.
Edited by Dan Guest