@vuntz addressed in the new commit.