Fix a checkin derp.

Also fix a compile-time warning.