I actually think he's put a new plan, or alternate one into action as regards no warm up tournament. He's been particularly clever in his career in respect of when/what to play, and it has indeed paid dividends.
And as for his draw, I personally feel it's better being a tough one for him, play him into shape. It's when he's been complacent in the past that he's had issues with his results. Perhaps it's tougher than he'd have liked, but I feel it will do him good when/if he progresses to the second week.
Andy Murray: Sherlock Holmes is my idol!