The new versions of the route handlers are a lot more consistent.

@cmc333333 @ascott1