simplify DefaultProperty wrap/unwrap code