Instead of passing back classes by default, passing an object. If a class is needed (as is the case for the Catalog.formatMap, the Format.__class__ built-in method can be used. This way, formats can be both binned by type and compared by size. Also tweaking disambiguation in sort string.

Signed-off-by: Ryan Helinski <rlhelinski@gmail.com>