In preparation for moving this to a better place, use the same code in
all the places where this code was duplicated.

Reconcile all implementations, document a little bit more the methods
and the future plans.