Update Generate-substitutions.py

And more simplification. D'oh!