Now that we've shortened everything, fix up all the indentation and
whitespace problems.  There are no functional changes.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>