Fixes naming issue with eliminator parameters, and eliminators on empty types

Fixes #1156 amongst other things