Reduce complexity and duplication; make accessor definition more explicit
Merge pull request #422 from marclove/reduce-serializer-code-complexity

Reduce duplication; make accessor definition more explicit