Simplify entity identifier qualification