Change default expr_type from grains to grain