is it right that the 'elf' bit isn't in any English version? Thank you again.

Correct regarding Child #2. You could argue that the English and American versions actually represent a different song, that incorporates the impossible tasks common to Elfin Knight. As for Child #4, there's little trace of elvishness at all, apart from the hint of a magical horn.