After posting the patch I noticed some statements are superfluous.

 

The modified patch is attached.