Don't unify annotation variables during W, no matter how easy
Fix measure constraint solver under delayed regime