Add some comments to the code, to help understand why an extra +1 is added (based on discussions in bug #39177)