While still suboptimal (you cannot use all the queries specified for .DE), at least this way we don't get cryptic error messages for standard queries.