Actually properly mark non-aggregatable ones