Begin: WIP consistent Begin/End behavior, more fixes.
3 files changed