Again, exactly right. I knew the original fairy tale pretty well when I first saw the film when I was seven (at a cinema rerelease) so I was surprised at what was omitted (the witch's two previous attempts at assassinating Snow White, for instance, plus the famous bit at the beginning when her mother pricks her finger).