Fixup after varrole-breakage.

Something in the last spur of patches made the retirement of VarRole immediately break the compiler on my code. Not sure why this wasn't triggered when I tested the Pointer changes before requesting the pull.