Rework token creation to use Result structs and Extract.
2 files changed