Re #6366 Start cutting code duplication