Add support for top-level $and expressions