More ~/usr refactoring.