<rdar://problem/13327940>

Cleaned up some paths.