Rewrite serialize handlers

[dktapps]

Using get_properties_for would be far preferable.

We don't really need a custom serialize handler; we just need to be able to provide a custom set of properties.
The current code is fragile.