Remove one more (harmless) return in the middle of a function

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Add more {} around one-line if() clauses

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>