Follow-on to #229 many elements now map to `generic`. this issue will track those, but serves mostly as a reminder right now.