Changes to make loading of the solvation libraries optional.