These "// jw:" comments are fine for now, but should probably be removed before submitting.  The github pull request diff makes all of your changes quite clear, so you can just go ahead and add or delete stuff.  We will know what you changed through the diff.