This change ensures we only have to change this logic once in order to get them to apply to both languages in the codebase.