Noted by Kyotaro Horiguchi, who also reviewed the previous patch, but
I failed to notice his review before committing.