Bug 987305 - Refactor EnumSerializer - r=nfroyd