Restructured packaging for query and update expressions.