Using the new parser would alleviate the need for this piece.