(Maint) Fixup from bad rebase

A rebase against the master branch had a non-conflicting merge that
caused some tests to fail. The tests were still using `@handler`, but
that had been changed to just `handler` in the work for the profiler.