Refactoring unmarshaller to factory, fixed up nullpointers in analyzer