This helper function was added a while ago and these are the remaining cases to convert, to save a bit of code size.