Add option serialization and comparison

It's within the failure condition, so it won't be printed unnecessarily...