Split AddVariable into AddVariable and AddLibraryVariable so the parameter sets work. Added more options to RemoveVariable.