Cleanup usage of escope

ariya/esrefactor#1