Fix another assert failure very similar to PR16651's test case. This
test case came from Benjamin and found the parallel bug in the vector
promotion code.
Cleanup the stats counters for the new implementation. These actually
count the right things and have the right names.