Remove dependency on org.eclipse.core.variables