Dropped more references to goto-10.