Regarding the modular nature of the catering provision. Yes, a future operator of the Greater Western could replace trolley service with a buffet. The current operator has ordered sets without though. The contract is signed, and the build is underway (first few sets being built in Japan). I imagine it's too late now to change interior spec without penalty clauses.
No they didn't, the DaFT did!
You do seem to have a problem keeping to the facts in all this don't you!
Best of luck to them.