antoniop
committed
on 15 Mar 19
Use api and portable idioms