Minor code cleanup: removed no-long-used deserialization labels.
Code cleanup: no longer need swap_internal_vals since switched to new deserialization code.