Merge pull request #285 from TheBlueMatt/2019-01-fuzz-cleanups