Christopher Waller is 'much more optimistic' on tariffs than before