Use some 5.4 syntax