Clean up the arbitrary instances file
Fix the cereal version so that it works
-Werror for travis