Clean up and "fix" << and >> width inference