Further 'make dist' fixage.