Fix lifting of case expressions