Clean up invalidation code due to add or removal of children
Merge pull request #220 from arv/cleanup-invalidation

Clean up invalidation code due to add or removal of children