Cleanup: some more use of initialiser lists.