Follow-up to 32f41c79

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

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