finishing cleanup of CLI and regularization as discussed yesterday

git-svn-id: http://gapt.googlecode.com/svn/trunk/source@2316 85d21ef8-add0-11de-ae77-5bfb9c5a3f34