Remove all shenanigans with propagation, and only consume nonuniform qualifiers exactly where needed (last minute).