Ah...sorry...I made the comment over at the "Swift version" of this PR...