Hmm, I don't remember making any wording suggestions on this one ... but I do know you've had him around forever, so who knows?
I wonder if Mantrap wouldn't benefit from a marker? That might add unnecessary wording, I suppose, but it could be nice to have the reminder for that round in which the figure is affected.