Switch to long form flags
Update arguments for latest pollock