John

Created WIP PR for consideration in #410

Necessary to compile with latest Zig master.