The final version of this code that lands on master should have this question settled and comments appropriately removed.