Further improvements in Piq option parsing