Resolved circular import issue with Python 3.