Refactor Rhizome manifest parsing some more