Coding style cleanups.
Signed-off-by: NAlasdair G Kergon <agk@redhat.com>
Signed-off-by: NJonathan Brassow <jbrassow@redhat.com>