Remove possible external dependency of s-upcase