I agree.  Just return the display markup, and strip later.