I have updated the patch with these changes. Looks more straightforward and c...