antoniop
committed
on 28 Jun 18
Apply finer-grained api where appropriate