Promoting variables now works. Still not optimal, promote for add can be
very slow.