Syntax adjustments to support switching between Sherpa2 and 3 versions more easily in the future.
cc @ewelina @fsiegert