Fix expression constructor to only gather items when mode is either 'all' or 'items'