Fix test 046.

Looks like a recent change put us on an untested code path, and we need
to start distinguishing callers' intentions. We can also remove some
unnecessary duplication.

Change-Id: I950139e6fdc8656b89d8e1520e8b50f681c7f7b2