message/query: Simplify CONTEXT messages/queries to only contain a single type