Clean up std:: types