Started work on some refactoring of clearProperties and the property
intercepter to make things simpler.  Some TODO entries added to indicate
where more work is still needed.