More changes to variable rendering code, yet again