Another commit:
Some decrease of code repetition.