kc: fix some leftover occurences of die()
kc: get rid of experimental when{}
kc: get rid of experimental smartmatch