Removed dependency on analysis (which imports all io stuff).