There doesn't seem to be a strategy arrived at yet by the accountants that I've discussed this with. It seems to be, take your money out now and do something with it. The inclination is to not keep it within Canada. The consensus among my small pool of clients seems to be to pay what taxes are owing on it and then remove it from the jurisdiction.
On September 28th, 2017. See this statement in context.