Factor the numbering computation into a separate method, and add the slightest attempt at some renumbering logic, which is currently unused.

llvm-svn: 51652