Here is the updated patch, with the new names and optional recursion: