Serialization cleanup: use enum for nType arg -- Take II

@jonasschnelli (and Jenkins) pointed out that my compilation coverage was lacking.  @laanwj noted the reduntant enum.  Both fixed in this version.