Remove remaining differentiation between ElementRefs and Elements for #19