- Using internal storage mechanism for property values
- Fixes according to other suggestions from Bryan Hughes