Unified 16-bit and 32-bit scheduling a bit more.