(Steve: sorry for poking around in code I can't test, but I'd like source consistency in platform-specific code, too. I'll commit in small pieces so it's clear what I'm up to, so it should be trivial to fix if I miss something.)