Added Class[@x] conversion and {Class[@x]: ...} inverse matching