Ported changes to all three languages.