cleanup: Tidy up the const classes and types.
cleanup: Tidy up the const classes and types.

FascinatedBox/lily,jesserayadkins/lily,FascinatedBox/lily,jesserayadkins/lily,jesserayadkins/lily,FascinatedBox/lily,FascinatedBox/lily