Continued effort to clean up manifest parsing (FELIX-98). This still has a long way to go, but eventually all manifest parsing, validation, and normalization will be done in the ManifestParser class.