Update to work with latest HEAD.