clean up some warnings

There are still warnings in the CmdLine module, but I left that alone
since it is likely to change soon anyway.