Implemented escape closing expanded,
Restored store from merge.