WaE: add explicit braces to avoid dangling else

Change-Id: I8def1c7859359b76a1258db82776177d65346c05