Yeah, I was thinking we were going all-in for R16 for the next version, but maybe instead we should DRY-up all of the times we use this and use the case statement there, so we can be backward compatible.