Shouldn't this be defined within the Raw class?  Also, should it's name be changed since it is no longer just the end tag token?