First bug fix is that the "unshadow" token conversion mistakenly transforms the oldes...