This removes the kludgy object re-definitions that were used to avoid circular
import errors.