Adapt our wax code to its major interface changes