Restored changes lost during "merge".
Small refactoring.