Remove more workarounds from #44