More changes regarding Nebentypus (may not all be correct…) (re #63)