builtin-add: simplify (and increase accuracy of) exclude handling