More E4X fixes and implementation