Tweak notation
Merge *_CONSTRAINTS_DIR options into *_CONSTRAINTS