Switch fish over to the new system. More breaking changes.