s3:secrets: rewrite secrets_delete_machine_password_ex() using helper variables