gwenhywfar: clean up options