Removed dependency on analysis.