Declension plugin little optimizations