osmo-pcu[master]: RFC: remove this == NULL checks