Declare a few more type values to avoid reconstructing.
This list was pointless.
Make use of more function type helpers in serialization.