also, notice how these inline comments are now "buried" in an "outdated diff" ... that kinda stinks.