Parser now filters comments