Better handling of scalars in DataModel::_a()