Misc cleanup.

git-svn-id: svn://svn.code.sf.net/p/open-axiom/code/trunk@3115 f499efd5-9937-0410-b36a-d3739c31ded8