I'm sorry. With respect to this main treaty-shopping point, the optional ways are either a detailed limitation on benefits route, which is what the U.S. has done, or a principal purposes test-type rule, which is what Canada and Barbados have signed on to in the MLI.
On February 7th, 2019. See this statement in context.