Adjust expansions based on debug-foreign?
Fix problem in git.foreign