Fetch variable declaration annotations from CV as we walk the OP tree

Maybe this isn't the right way to go about it, so feel free to revert
this. In general, what needs reassessing is the ownership of the Type*.