Minor code cleanup for entity rendering order