Avoid circular imports, bump