Fix to ill-conceived Generic Element list

This made some bad assumptions and definitely broke backward compatibility