Cleanup some inline tuple warnings