naming cleanup.
moved modifier code into ser/deser implementations.
resolved warnings.