#KJ-KJ-38 Elaborate constructor signatures. Some refactoring preparing for the main task.