I think they will leave out the part at the beginning about the old man and the house where Voldemort hold up at. They may mention the S.P.E.W. thing but I don't think it will be a focal point just a side thing.