Yeah, a separate commit would let us handle the parsing logic in isolation. If it is good on both branches, I'd just push directly.