Update to follow the final (or what is currently the final) syntax.