It is doing the right thing, but now that I look at it, the local import is no longer necessary to avoid circular imports.