from Jason Wilkins (jwilkins) only applied some parts: * const correctness * moved a variable into a move local scope so it is also inside a #if/endif and does not end up conditionally unused
from Jason Wilkins (jwilkins) only applied some parts: * const correctness * moved a variable into a move local scope so it is also inside a #if/endif and does not end up conditionally unused