Bug 1116467 - Beef up E4X compatibility