Merge "Clean up files' dependencies on phony targets."