Additional fixes for histogram merging with expanding axes

Work around a bug in ROOT when merging an empty histogram with a different one where an axis has been expanded

Also clean up indentation