wrag: clean up & fix opt forwarding