Cleaned up parse analysis mode handling. Added dependency to text package.