Cleaning up some stray warnings in the code.