clean up some ugliness in UnparserFilterNew

@liyili2 please review.