Modernize, fuzz. Fixes #15