Slight changes in preparation for optimizing
Array-based optimization for rendering.