Generalize element-context checks, remove list of element-returning methods, #33