Both, I believe.
"That would depend on the manner of your return" was something Denethor said to Faramir in both -- wow, something that made the transition and stayed in the same people's mouths!
I feel a bit out of line, popping in when I've only been lurking up till now...
