@Robert: Yeah, nice, that stuff is tricky…
I also discovered that, on Mac anyway, control + space bar switches between keyboard layouts, so that might help?