Perhaps change orphan to orphan_handler? (not in your change set, but perhaps do it now anyway?)