Make the standalone stuff a little cleaner, fix some checkpatch warnings.
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>