One more small code reuse change:

Tested x86_64-pc-linux-gnu, applied to trunk.