Clean up warnings.  Fixes issue #25.