Remove unused m4 files, add or update others as necessary.