Fix breaking changes caused by Semigroupoid