Investigate Rider "Style class is expected" errors

These errors started popping up after #734 or #736. 
They don't appear to cause any issue on building, not clear if there is an issue at runtime.

It's likely to be a false positive, but we should figure out why the issues are being listed and how to remove the false positives. 