Fixes #5558: allow to use $ { } in variables and correct class condition...

... and reporting
I really really really wanted to put canonify here; but it fails :(