3066
3067

Sync trace layer with top-level yet again.
3068

Time to be more careful; if we're changing what the first layer should do,
then create a corresponding non-literate version first.