Update to reflect new parsing approach.