Some minor fixes for C++23 compilation errors.

[zvookin]

First is just a requirement that a template be declared before use. Second is removing volatile from non-reference return types.