[No reviewer required] Reorder member variables to fix warnings