This was just a reordering to group together the `_respond` functions. Unfortunately it makes the diffs a bit hard to read.