Same comments that I left for the filter parser apply here too.