Cover all the cases.

It wasn't needed for the particular use I was digging through, but we might as well thoroughly do
the job the method doc claims we're doing.