Extract finish-parsing into its own function