Fix some imports broken by removal of code from __init__.py files.