Add additional tests
Experiment with explicit substitution

With this change, building std-0-output takes less than half the time.