Bug fix: will/did close methods called in certain cases where they needn't be.