Follow up to my last change - use "element access functions" consistently.