shouldn't this be `when-one` and `when-other` below?