but wait; Gandalf's comments on the far country come from the movies, not from JRR.

In the DVD extras, the makers note that these beautiful words from Tolkien are moved to a different place, a different character and a different purpose. They seem quite pleased with themselves. McKellen notes that it's a bit problematic that an older war-leader is telling a young soldier that he'll go to Heaven if he falls in battle, an old, old story, but nobody remarks on the fact that:

Gandalf straight out tells Pippin that Hobbits go to Valinor when they die!