Using explicit checks in wb.Statement

Change-Id: Ief51349de5b8d7e337ebc5fc9fcc2ee7c1aa9fa6