Fix forwarder references in unbound code