NYC: Make parsing faster/more reliable