Fix recently introduced clang warnings

• Fix class/struct mismatches

• Fix -Wunneeded-internal-declaration warnings

• Fix warning: returning reference to local temporary object

• Fix failing tests in clang

/cc @jkubat