Clean up some -Xlint messages