Also, make our redefinition of done more robust under different
orders of Importing modules.