Revisit implementation of disposeInternal functions. (See #29)