A bit of cleanup after request handler changes.