Fix order of overrides for phar compression.
Add a few more substitutions.