In a couple of places I was not 100% sure that there would not be a side effect in a function call, so I left the call in a comment for review.  If a second opinion agrees that it can be safely removed, I will do so.