Another 32-bit fix.
Merge branch 'better-code-signature-logging' into sketch