Minor further refactoring of Theory ParameterSupplier setup