Tweaks to work with new ValWrapper code ...