Instead of wrapping 'filenames' value in a list if it's a
        string, wrap it if it's a string or unicode string.