Simplifies, clarifies the source code.

git-svn-id: http://svn.code.sf.net/p/fmj/code/fmj@80 799b4810-d841-4bb4-a54b-9156a0c3e4cd