Stop carrying an element reference around