Merge branch '21-misc-cleanup' into 22-more-scalars
Merge branch '21-lookup' into 22-more-scalars
preserve constants in serialize/unserialize
Merge branch '22-more-scalars' into 23