Version 0 0 243 498: Move more platform-specific code into the correct files.