Some variables are declared using old-style declarations. These should be modified to conform to modern style.

This is a task derived from https://github.com/openjdk/jdk/pull/11848