simplify DefaultProperty wrap/unwrap code
Merge pull request #82 from dannyroberts/simplify-conversion

simplify DefaultProperty wrap/unwrap code