Clean up for easier cross-compilation.