where she suddenly became shallow and nearly left the Doctor because he wasn't young anymore. ... (and it made me grind my teeth when Capaldi went "I'm Scottish, I can COMPLAIN!" and then "Oh, ~Amy~ would have been so awesome if she were here" - seriously, she's turning into Rose)

So, IOW, Moffat's standard operating procedures are still firmly in place. Good to know. Wake me up when the reign of horrible is over.