Agreed, see the note at https://github.com/xbmc/xbmc/pull/2681/files#L42R787 .  There are probably a few others to do this for as well.