Most of these were just missed when they were added, right? (ie, these are bugfix lines)