Fix various whitespace issues.

No functional changes.
Signed-off-by: NRob Ward <robert.ward114@googlemail.com>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>