Fix merge snafu in last commit. (Oops.)