More declaration reordering for consistency