Consolidate "Variable Declarations" and "Variables & Arrays"