Add if-some and when-some to list of let-like forms