Binary cleanup

Tiny cleanups for cardboard binary.