Handle i64 first for clarity. No functionality change.