Move more stuff from el-get.