Slightly better multi-architecture support; work in progress.