Done, but doing so uncovered a bug where we were not merging the filters of the handler results correctly with the body. I'll try and have that fix in tonight.