@@ -103,26 +103,26 @@
 			[OFApplication terminateWithStatus: 1];
 			break;
 		}
 	}
 
-	if ([[optionsParser remainingArguments] count] != 1) {
+	if (optionsParser.remainingArguments.count != 1) {
 		showHelp(of_stderr, false);
 
 		[OFApplication terminateWithStatus: 1];
 	}
 
 	id <PasswordGenerator> generator = (_legacy
 	    ? [LegacyPasswordGenerator generator]
 	    : [NewPasswordGenerator generator]);
-	generator.site = [[optionsParser remainingArguments] firstObject];
+	generator.site = optionsParser.remainingArguments.firstObject;
 
 	if (lengthString != nil) {
 		bool invalid = false;
 
 		@try {
-			generator.length = (size_t)[lengthString decimalValue];
+			generator.length = (size_t)lengthString.decimalValue;
 		} @catch (OFInvalidFormatException *e) {
 			invalid = true;
 		} @catch (OFOutOfRangeException *e) {
 			invalid = true;
 		}
@@ -188,11 +188,11 @@
 		}
 	} @finally {
 		of_explicit_memset(passphrase, 0, strlen(passphrase));
 
 		if (keyfile != nil)
-			of_explicit_memset([keyfile items], 0, [keyfile count]);
+			of_explicit_memset(keyfile.items, 0, keyfile.count);
 	}
 
 	[OFApplication terminate];
 }
 @end