Remove commented out code
Move ifvarclass processing for common bundles to the proper place
Merge two nearly identical branches of the code in KeepClassContextPromise
Remove noop code which duplicates logic from AcquireLock
Split evaluation of 'dist' and 'and/or/xor' constraints in class promises
Nothing sets 'done' flag in class promises to true, so no need to set it back to 'false'