Proper handling of MultipleDefinition. Closes #6.