Fix promotion of a gluing query with a conjunctive query

[epatters]

There were actually several bugs here:

• A missing case in promote_query_rule, a bug that goes back to my original code
• Several places where type information was lost due to (what else?) maps over empty vectors