Add class properties where appropriate

This improves Swift compatibility.