[PATCH 0/2] Small cleanups to splice forwarding logic