Upgrade mori/ki support files to keep up with 'destructuring' branch.