Fix warnings when building jam.

Sorry for the included whitespace cleanup.