Add support for multiple parser types
Remove useless comment.