Fix lexical code-gen/dyn-comp interaction.