Flicker parser rewrite