Reintroduce a simple function refactoring done in r112934, also without any functiona...