Fix class variable instantiation and method return types

[ammgws]

I believe these are all broken at the moment.

I cannot test these devices, but the same changes to a new device type I'm testing work fine.

[scottyphillips]

These are all stub classes but yes all those issues would have meant they were completely broken