Got rid of extra_jars as this can be done using files.
Alphanetise parameters to make them easier to compare.