Refactorings and small generation changes supporting escape target.
8 files changed