Trivial - moved some code.
Made Fernandez' algorithm code slightly less ugly.
Tried removing some unnecessary command-line options.
Tried removing some unnecessary command-line options.