From briefly looking over the code, this appears the problem lies in the ComponentType method #isModified. Unlike the corresponding #isDirty methods, the #isModified method doesn't equate null and empty components as equal. I'll make this adjustment and run the test suite, but I suspect that's the reason for the failure under this scenario.