Removed the "which" in the user-defined UCF constraints logic.