Fix merge errors that surfaced in last commit.