I was briefly confused about this while touching related code, so I thought I'd change things to be consistent.
@apol @ratijas