Redo forwarding expansion code.