Code Refresh to make the OoO people happy.

The commit introduces no real new functionality, except for a more
simplified usage of the code.