Merge StorableClassType.Empty into StorableClassType.MarkedOnly and make it the default if not specified (#548)