Improve namespace cleanup to make sure some required directories stick around, and...