BHV-11483: Consolidate variable declarations.