Simplify registry builder by simply failing on a bad parse
Fix build for changes to std