Removed a couple of unnecessary stubs and put in element_* in a few missing places