Further variable code fixes.