Fix 'make check' regressions from a2e62741f7c4721a692dd34fd3e82a7da8f357...

...51