Changes to variable handling and some prep for singleton VisStyleHelper.