We require JDK17, hence we can rely on improved object layout and
do not need to play as many tricks with field shadowing. Move the flag
to its sole user.
Change-Id: I514eb8fc4f9b228854450bfd4adfa284f00616a0 Signed-off-by: Robert Varga <robert.varga@pantheon.tech>