Merge "Tweaked chooseBlock() comments"