Updated xctool to use all variables.