Improved s.toString().