Two more functions here, addIndex and addExprIndex follow the pattern and do not need to change. The caller can call setAssumeUnique if it needs to.