Define more properties as protected.

These should be the last two leaking properties.