Account correctly for sex supply barriers and subsidies See merge request !5922
mentioned in issue #1358 (closed)