Formatted.
Refactored JAXB notification into class hierarchy to allow for further
subtypes.