Merge "Clean up paths.h."