Fix self vars.