Almost. The common thinking is that a non returner may spend considerable time in a pureland doing the final tune-up . One who does not return is not neccesarily fully enlightened, but is sure to get there.
There are probably endless variations on these ideas.
Sergeant Schultz knew everything there was to know.