Removed get-password-or-apikey function, changed argument evaluation order.