TEMP: patching to get it to bootstrap

Need to find a balance in widenIfNecessary for final vals.
Sometimes we should only deconst, other times we must widen
(which I did manually in the source here).