These parts were forgotten to be committed together with the rest of
32f41c79

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>

(cherry picked from commit b1ee32ed)