Revert a previous regression in astobj2.c from merging a branch.