1) Address some warnings related to types. 2) Made code more readable and easier to interpret during debugging.
Authored by: dcaffrey 2023-07-03
Parent: [r1803]
Child: [r1805]
