This is a follow-up to 79ae975a (addressing #2233) Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>