More declaration reordering