(#1549) - move to opts-style args