Minor cleanup while trying the "easy way" to avoid hard-linked
directories. Will have to find another way.