I think we also need one for the underscore version as well, though I know it'd be nice if we didn't have to duplicate entries like this.