Various changes to morphosyntax classes