Version 0.6.2 - Fix re adding shortcut expects - Fix returning of opaque terms in shortcut expectations