Code fixes to mirror documentation changes made in previous commit.