rhogen: move back self_instance optimization