Yeah, more or less. The “elves/fairies are nice, or at least _good_” thing is a fairly modern creation (owing a lot to Tolkien, really).