Minor formatting cleanups -- no functional changes intended.