Fixed a rebasing merge quirk and updated syntax.