Note, that "Updates per Carl Schwan's feedback" commit covers Carl Schwan's review of the first 2 commits.