Remove/refactor some .unwraps & make some JSON valid.#78

huonw wants to merge 2 commits intorust-lang:masterrust-lang/cargo:masterfrom

huonw:minor-de-.unwrappinghuonw/cargo:minor-de-.unwrappingCopy head branch name to clipboard