Simplify the container sugar further

There was only one place branching on $name_is_obj left, so we might as well get
rid of the temporary.