Reinstate type-annotation on case-expressions