Remove a seemingly unnecessary fork().  Incidentally resolves #91.

There also a few unrelated tweaks tossed in.