Well put. The only annoying thing about the Doctor here is his passivity until near the end; it's hyperactive Mel going round doing the real sleuthing.