Flag more E4x and treat scripts right (bug 820460)