Clean up property internals.

Make more use of oicc features.