CleanUps does not tolerate single-statement if-else clauses and recently found several in licenses.model plug-in.
Automatic clean-ups demands are satisfied (pull request is merged), but this improvement will only stand until next generation is performed.
So prior this next generation we should change templates accordingly.