Original commit message from CVS: remove deprecated properties fix up enums to correctly have short lowercase dashed nicks