EXTRA_DIST / CLEANFILES consistency fixes