@@ -32,19 +32,15 @@
 	uint16_t _port;
 	OFString *_user, *_password, *_path, *_parameters, *_query, *_fragment;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (copy) OFString *scheme;
-@property (copy) OFString *host;
+@property (copy) OFString *scheme, *host;
 @property uint16_t port;
-@property (copy, nullable) OFString *user;
-@property (copy, nullable) OFString *password;
+@property OF_NULLABLE_PROPERTY (copy) OFString *user, *password;
 @property (copy) OFString *path;
-@property (copy, nullable) OFString *parameters;
-@property (copy, nullable) OFString *query;
-@property (copy, nullable) OFString *fragment;
+@property OF_NULLABLE_PROPERTY (copy) OFString *parameters, *query, *fragment;
 #endif
 
 /*!
  * Creates a new URL.
  *