Fixup account cancellation logic.
Don't specify args inside the string. Fixes password reset flow.
Ensure NaN and Number stuff is consistent
Fix another minor cross-driver compatibility bug