Make everything a val again