It looks like the only change here was to remove three type signatures. Maybe this was inadvertent from the merge? These should probably all be added back.