Fix warnings; more whitespace clean-up.