More work on forwarding.