Minor cosmetics.  Cleaned up metric classes and added better handling
in Scanner for cases of missing/partial seed data.