whatnow: Re-integrated whom(1); cleanups.
[mmh] / DATE
1 27 April 2008