Removed the remaining Xlint warnings for auto-tupling