Made surround() being safe with numbers and strings.