Changed some new uses of UniqueId? to the ast version. Changed where some debugging variables are stored.