Tidy up -keep* flags