Remove more workarounds from #44 (-reduce)