Also minor improvements to the looping/if-branching code and documentation changes Functionally, this change is a NOP