Make comments more consistent; give each Enumeration instance a parameterized type.