Index: src/OFCondition.h
==================================================================
--- src/OFCondition.h
+++ src/OFCondition.h
@@ -112,12 +112,11 @@
  * @param date The date at which the timeout is reached
  * @param signalMask A pointer to a signal mask of Exec Signals to receive.
  *		     This is modified and set to the mask of signals received.
  * @return Whether the condition has been signaled or a signal received
  */
-- (bool)waitUntilDate: (OFDate *)date
-	 orExecSignal: (ULONG *)signalMask;
+- (bool)waitUntilDate: (OFDate *)date orExecSignal: (ULONG *)signalMask;
 #endif
 
 /**
  * @brief Signals the next waiting thread to continue.
  */

Index: src/OFCryptoHash.h
==================================================================
--- src/OFCryptoHash.h
+++ src/OFCryptoHash.h
@@ -96,12 +96,11 @@
  * @brief Adds a buffer to the cryptographic hash to be calculated.
  *
  * @param buffer The buffer which should be included into the calculation
  * @param length The length of the buffer
  */
-- (void)updateWithBuffer: (const void *)buffer
-		  length: (size_t)length;
+- (void)updateWithBuffer: (const void *)buffer length: (size_t)length;
 
 /**
  * @brief Resets all state so that a new hash can be calculated.
  *
  * @warning This invalidates any pointer previously returned by @ref digest. If

Index: src/OFData.h
==================================================================
--- src/OFData.h
+++ src/OFData.h
@@ -92,12 +92,11 @@
  *
  * @param items The items to store in the OFData
  * @param count The number of items
  * @return A new autoreleased OFData
  */
-+ (instancetype)dataWithItems: (const void *)items
-			count: (size_t)count;
++ (instancetype)dataWithItems: (const void *)items count: (size_t)count;
 
 /**
  * @brief Creates a new OFData with the specified `count` items of the
  *	  specified size.
  *
@@ -184,12 +183,11 @@
  *
  * @param items The items to store in the OFData
  * @param count The number of items
  * @return An initialized OFData
  */
-- (instancetype)initWithItems: (const void *)items
-			count: (size_t)count;
+- (instancetype)initWithItems: (const void *)items count: (size_t)count;
 
 /**
  * @brief Initialized an already allocated OFData with the specified `count`
  *	  items of the specified size.
  *

Index: src/OFDatagramSocket.h
==================================================================
--- src/OFDatagramSocket.h
+++ src/OFDatagramSocket.h
@@ -168,12 +168,11 @@
  * If the buffer is too small, the datagram is truncated.
  *
  * @param buffer The buffer to write the datagram to
  * @param length The length of the buffer
  */
-- (void)asyncReceiveIntoBuffer: (void *)buffer
-			length: (size_t)length;
+- (void)asyncReceiveIntoBuffer: (void *)buffer length: (size_t)length;
 
 /**
  * @brief Asynchronously receives a datagram and stores it into the specified
  *	  buffer.
  *

Index: src/OFFileManager.h
==================================================================
--- src/OFFileManager.h
+++ src/OFFileManager.h
@@ -374,12 +374,11 @@
  * @brief Creates a directory at the specified URL.
  *
  * @param URL The URL of the directory to create
  * @param createParents Whether to create the parents of the directory
  */
-- (void)createDirectoryAtURL: (OFURL *)URL
-	       createParents: (bool)createParents;
+- (void)createDirectoryAtURL: (OFURL *)URL createParents: (bool)createParents;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Returns an array with the items in the specified directory.
  *
@@ -427,12 +426,11 @@
  * directory.
  *
  * @param source The file, directory or symbolic link to copy
  * @param destination The destination path
  */
-- (void)copyItemAtPath: (OFString *)source
-		toPath: (OFString *)destination;
+- (void)copyItemAtPath: (OFString *)source toPath: (OFString *)destination;
 #endif
 
 /**
  * @brief Copies a file, directory or symbolic link (if supported by the OS).
  *
@@ -444,12 +442,11 @@
  * directory.
  *
  * @param source The file, directory or symbolic link to copy
  * @param destination The destination URL
  */
-- (void)copyItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (void)copyItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Moves an item.
  *
@@ -461,12 +458,11 @@
  * removed using @ref removeItemAtPath:.
  *
  * @param source The item to rename
  * @param destination The new name for the item
  */
-- (void)moveItemAtPath: (OFString *)source
-		toPath: (OFString *)destination;
+- (void)moveItemAtPath: (OFString *)source toPath: (OFString *)destination;
 #endif
 
 /**
  * @brief Moves an item.
  *
@@ -478,12 +474,11 @@
  * @ref copyItemAtURL:toURL: and the source removed using @ref removeItemAtURL:.
  *
  * @param source The item to rename
  * @param destination The new name for the item
  */
-- (void)moveItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (void)moveItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Removes the item at the specified path.
  *
@@ -513,12 +508,11 @@
  * This method is not available on some systems.
  *
  * @param source The path to the item for which a link should be created
  * @param destination The path to the item which should link to the source
  */
-- (void)linkItemAtPath: (OFString *)source
-		toPath: (OFString *)destination;
+- (void)linkItemAtPath: (OFString *)source toPath: (OFString *)destination;
 #endif
 
 /**
  * @brief Creates a hard link for the specified item.
  *
@@ -528,12 +522,11 @@
  * This method is not available for all URLs.
  *
  * @param source The URL to the item for which a link should be created
  * @param destination The URL to the item which should link to the source
  */
-- (void)linkItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (void)linkItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 #ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
 /**
  * @brief Creates a symbolic link for an item.
  *

Index: src/OFGZIPStream.h
==================================================================
--- src/OFGZIPStream.h
+++ src/OFGZIPStream.h
@@ -103,12 +103,11 @@
  * @param stream The underlying stream for the OFGZIPStream
  * @param mode The mode for the OFGZIPStream. Valid modes are "r" for reading
  *	       and "w" for writing.
  * @return A new, autoreleased OFGZIPStream
  */
-+ (instancetype)streamWithStream: (OFStream *)stream
-			    mode: (OFString *)mode;
++ (instancetype)streamWithStream: (OFStream *)stream mode: (OFString *)mode;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFGZIPStream with the specified

Index: src/OFHMAC.h
==================================================================
--- src/OFHMAC.h
+++ src/OFHMAC.h
@@ -91,21 +91,19 @@
  *	    it yourself before calling @ref setKey:length:!
  *
  * @param key The key for the HMAC
  * @param length The length of the key for the HMAC
  */
-- (void)setKey: (const void *)key
-	length: (size_t)length;
+- (void)setKey: (const void *)key length: (size_t)length;
 
 /**
  * @brief Adds a buffer to the HMAC to be calculated.
  *
  * @param buffer The buffer which should be included into the calculation
  * @param length The length of the buffer
  */
-- (void)updateWithBuffer: (const void *)buffer
-		  length: (size_t)length;
+- (void)updateWithBuffer: (const void *)buffer length: (size_t)length;
 
 /**
  * @brief Resets the HMAC so that it can be calculated for a new message.
  *
  * @note This does not reset the key so that a new HMAC with the same key can

Index: src/OFHTTPCookieManager.h
==================================================================
--- src/OFHTTPCookieManager.h
+++ src/OFHTTPCookieManager.h
@@ -52,12 +52,11 @@
  *	    If you do not want this, pass a copy!
  *
  * @param cookie The cookie to add to the manager
  * @param URL The URL for which the cookie should be added
  */
-- (void)addCookie: (OFHTTPCookie *)cookie
-	   forURL: (OFURL *)URL;
+- (void)addCookie: (OFHTTPCookie *)cookie forURL: (OFURL *)URL;
 
 /**
  * @brief Adds the specified cookies for the specified URL.
  *
  * @warning This modifies the cookies (e.g. it sets the domain if it is unset)!

Index: src/OFInvocation.h
==================================================================
--- src/OFInvocation.h
+++ src/OFInvocation.h
@@ -72,21 +72,19 @@
  * @brief Sets the argument for the specified index.
  *
  * @param buffer The buffer in which the argument is stored
  * @param index The index of the argument to set
  */
-- (void)setArgument: (const void *)buffer
-	    atIndex: (size_t)index;
+- (void)setArgument: (const void *)buffer atIndex: (size_t)index;
 
 /**
  * @brief Gets the argument for the specified index.
  *
  * @param buffer The buffer in which the argument is stored
  * @param index The index of the argument to get
  */
-- (void)getArgument: (void *)buffer
-	    atIndex: (size_t)index;
+- (void)getArgument: (void *)buffer atIndex: (size_t)index;
 
 /**
  * @brief Sets the return value.
  *
  * @param buffer The buffer in which the return value is stored

Index: src/OFKeyValueCoding.h
==================================================================
--- src/OFKeyValueCoding.h
+++ src/OFKeyValueCoding.h
@@ -59,21 +59,19 @@
  * @brief Set the value for the specified key.
  *
  * @param value The value for the specified key
  * @param key The key of the value to set
  */
-- (void)setValue: (nullable id)value
-	  forKey: (OFString *)key;
+- (void)setValue: (nullable id)value forKey: (OFString *)key;
 
 /**
  * @brief Set the value for the specified key path.
  *
  * @param value The value for the specified key path
  * @param keyPath The key path of the value to set
  */
-- (void)setValue: (nullable id)value
-      forKeyPath: (OFString *)keyPath;
+- (void)setValue: (nullable id)value forKeyPath: (OFString *)keyPath;
 
 /**
  * @brief This is called by @ref setValue:forKey: if the specified key does not
  *	  exist.
  *
@@ -80,12 +78,11 @@
  * By default, this throws an @ref OFUndefinedKeyException.
  *
  * @param value The value for the specified undefined key
  * @param key The undefined key of the value to set
  */
--  (void)setValue: (nullable id)value
-  forUndefinedKey: (OFString *)key;
+-  (void)setValue: (nullable id)value forUndefinedKey: (OFString *)key;
 
 /**
  * @brief This is called by @ref setValue:forKey: if the specified key is a
  *	  scalar, but the value specified is `nil`.
  *

Index: src/OFLHAArchive.h
==================================================================
--- src/OFLHAArchive.h
+++ src/OFLHAArchive.h
@@ -63,12 +63,11 @@
  * @param mode The mode for the LHA file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFLHAArchive
  */
-+ (instancetype)archiveWithStream: (OFStream *)stream
-			     mode: (OFString *)mode;
++ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Creates a new OFLHAArchive object with the specified file.
  *
@@ -76,12 +75,11 @@
  * @param mode The mode for the LHA file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFLHAArchive
  */
-+ (instancetype)archiveWithPath: (OFString *)path
-			   mode: (OFString *)mode;
++ (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode;
 #endif
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
@@ -107,12 +105,11 @@
  * @param mode The mode for the LHA file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFLHAArchive
  */
-- (instancetype)initWithPath: (OFString *)path
-			mode: (OFString *)mode;
+- (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode;
 #endif
 
 /**
  * @brief Returns the next entry from the LHA archive or `nil` if all entries
  *	  have been read.

Index: src/OFMessagePackExtension.h
==================================================================
--- src/OFMessagePackExtension.h
+++ src/OFMessagePackExtension.h
@@ -50,12 +50,11 @@
  *
  * @param type The MessagePack extension type
  * @param data The data for the extension
  * @return A new, autoreleased OFMessagePackRepresentation
  */
-+ (instancetype)extensionWithType: (int8_t)type
-			     data: (OFData *)data;
++ (instancetype)extensionWithType: (int8_t)type data: (OFData *)data;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFMessagePackRepresentation with the

Index: src/OFMutableData.h
==================================================================
--- src/OFMutableData.h
+++ src/OFMutableData.h
@@ -84,12 +84,11 @@
  *
  * @param itemSize The size of a single element in the OFMutableData
  * @param capacity The initial capacity for the OFMutableData
  * @return A new autoreleased OFMutableData
  */
-+ (instancetype)dataWithItemSize: (size_t)itemSize
-			capacity: (size_t)capacity;
++ (instancetype)dataWithItemSize: (size_t)itemSize capacity: (size_t)capacity;
 
 /**
  * @brief Initializes an already allocated OFMutableData with an item size of 1.
  *
  * @return An initialized OFMutableData
@@ -122,12 +121,11 @@
  *
  * @param itemSize The size of a single element in the OFMutableData
  * @param capacity The initial capacity for the OFMutableData
  * @return An initialized OFMutableData
  */
-- (instancetype)initWithItemSize: (size_t)itemSize
-			capacity: (size_t)capacity;
+- (instancetype)initWithItemSize: (size_t)itemSize capacity: (size_t)capacity;
 
 /**
  * @brief Returns a specific item of the OFMutableData.
  *
  * Modifying the returned item directly is allowed and will change the contents
@@ -149,21 +147,19 @@
  * @brief Adds an item to the OFMutableData at the specified index.
  *
  * @param item A pointer to an arbitrary item
  * @param index The index where the item should be added
  */
-- (void)insertItem: (const void *)item
-	   atIndex: (size_t)index;
+- (void)insertItem: (const void *)item atIndex: (size_t)index;
 
 /**
  * @brief Adds items from a C array to the OFMutableData.
  *
  * @param items A C array containing the items to add
  * @param count The number of items to add
  */
-- (void)addItems: (const void *)items
-	   count: (size_t)count;
+- (void)addItems: (const void *)items count: (size_t)count;
 
 /**
  * @brief Adds items from a C array to the OFMutableData at the specified index.
  *
  * @param items A C array containing the items to add

Index: src/OFMutableString.h
==================================================================
--- src/OFMutableString.h
+++ src/OFMutableString.h
@@ -31,12 +31,11 @@
  * @brief Sets the character at the specified index.
  *
  * @param character The character to set
  * @param index The index where to set the character
  */
-- (void)setCharacter: (of_unichar_t)character
-	     atIndex: (size_t)index;
+- (void)setCharacter: (of_unichar_t)character atIndex: (size_t)index;
 
 /**
  * @brief Appends another OFString to the OFMutableString.
  *
  * @param string An OFString to append
@@ -109,12 +108,11 @@
  * `const of_unichar_t *`.
  *
  * @param format A format string which generates the string to append
  * @param arguments The arguments used in the format string
  */
-- (void)appendFormat: (OFConstantString *)format
-	   arguments: (va_list)arguments;
+- (void)appendFormat: (OFConstantString *)format arguments: (va_list)arguments;
 
 /**
  * @brief Prepends another OFString to the OFMutableString.
  *
  * @param string An OFString to prepend
@@ -149,12 +147,11 @@
  * @brief Inserts a string at the specified index.
  *
  * @param string The string to insert
  * @param index The index
  */
-- (void)insertString: (OFString *)string
-	     atIndex: (size_t)index;
+- (void)insertString: (OFString *)string atIndex: (size_t)index;
 
 /**
  * @brief Deletes the characters at the specified range.
  *
  * @param range The range of the characters which should be removed

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -399,12 +399,11 @@
  * @param selector The selector to perform
  * @param object The object that is passed to the method specified by the
  *		 selector
  * @return The object returned by the method specified by the selector
  */
-- (nullable id)performSelector: (SEL)selector
-		    withObject: (nullable id)object;
+- (nullable id)performSelector: (SEL)selector withObject: (nullable id)object;
 
 /**
  * @brief Performs the specified selector with the specified objects.
  *
  * @param selector The selector to perform
@@ -817,12 +816,11 @@
  * @brief Performs the specified selector after the specified delay.
  *
  * @param selector The selector to perform
  * @param delay The delay after which the selector will be performed
  */
-- (void)performSelector: (SEL)selector
-	     afterDelay: (of_time_interval_t)delay;
+- (void)performSelector: (SEL)selector afterDelay: (of_time_interval_t)delay;
 
 /**
  * @brief Performs the specified selector with the specified object after the
  *	  specified delay.
  *

Index: src/OFRunLoop+Private.h
==================================================================
--- src/OFRunLoop+Private.h
+++ src/OFRunLoop+Private.h
@@ -126,10 +126,9 @@
 # endif
   delegate: (nullable id <OFSequencedPacketSocketDelegate>)delegate;
 + (void)of_cancelAsyncRequestsForObject: (id)object
 				   mode: (of_run_loop_mode_t)mode;
 #endif
-- (void)of_removeTimer: (OFTimer *)timer
-	       forMode: (of_run_loop_mode_t)mode;
+- (void)of_removeTimer: (OFTimer *)timer forMode: (of_run_loop_mode_t)mode;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFRunLoop.h
==================================================================
--- src/OFRunLoop.h
+++ src/OFRunLoop.h
@@ -100,12 +100,11 @@
  * @brief Adds an OFTimer to the run loop for the specified mode.
  *
  * @param timer The timer to add
  * @param mode The run loop mode in which to run the timer
  */
-- (void)addTimer: (OFTimer *)timer
-	 forMode: (of_run_loop_mode_t)mode;
+- (void)addTimer: (OFTimer *)timer forMode: (of_run_loop_mode_t)mode;
 
 #ifdef OF_AMIGAOS
 /**
  * @brief Adds an Exec Signal to the run loop.
  *
@@ -118,13 +117,11 @@
  * @param target The target to call when the signal was received
  * @param selector The selector to call on the target when the signal was
  *		   received. The selector must have one parameter for the ULONG
  *		   of the signal that was received.
  */
-- (void)addExecSignal: (ULONG)signal
-	       target: (id)target
-	     selector: (SEL)selector;
+- (void)addExecSignal: (ULONG)signal target: (id)target selector: (SEL)selector;
 
 /**
  * @brief Adds an Exec Signal to the run loop for the specified mode.
  *
  * If a signal is added multiple times, the specified methods will be performed

Index: src/OFSCTPSocket.h
==================================================================
--- src/OFSCTPSocket.h
+++ src/OFSCTPSocket.h
@@ -88,21 +88,19 @@
  * @brief Connect the OFSCTPSocket to the specified destination.
  *
  * @param host The host to connect to
  * @param port The port on the host to connect to
  */
-- (void)connectToHost: (OFString *)host
-		 port: (uint16_t)port;
+- (void)connectToHost: (OFString *)host port: (uint16_t)port;
 
 /**
  * @brief Asynchronously connect the OFSCTPSocket to the specified destination.
  *
  * @param host The host to connect to
  * @param port The port on the host to connect to
  */
-- (void)asyncConnectToHost: (OFString *)host
-		      port: (uint16_t)port;
+- (void)asyncConnectToHost: (OFString *)host port: (uint16_t)port;
 
 /**
  * @brief Asynchronously connect the OFSCTPSocket to the specified destination.
  *
  * @param host The host to connect to
@@ -146,10 +144,9 @@
  *	       IPv6 to bind to all.
  * @param port The port to bind to. If the port is 0, an unused port will be
  *	       chosen, which can be obtained using the return value.
  * @return The port the socket was bound to
  */
-- (uint16_t)bindToHost: (OFString *)host
-		  port: (uint16_t)port;
+- (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFSandbox.h
==================================================================
--- src/OFSandbox.h
+++ src/OFSandbox.h
@@ -258,10 +258,9 @@
  *		      x          | Make the path available for executing, like
  *		                 | @ref allowsExec
  *		      c          | Make the path available for creation and
  *		                 | deletion, like @ref allowsCreatingFiles
  */
-- (void)unveilPath: (OFString *)path
-       permissions: (OFString *)permissions;
+- (void)unveilPath: (OFString *)path permissions: (OFString *)permissions;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFSequencedPacketSocket.h
==================================================================
--- src/OFSequencedPacketSocket.h
+++ src/OFSequencedPacketSocket.h
@@ -176,12 +176,11 @@
  *
  * @param buffer The buffer to write the packet to
  * @param length The length of the buffer
  * @return The length of the received packet
  */
-- (size_t)receiveIntoBuffer: (void *)buffer
-		     length: (size_t)length;
+- (size_t)receiveIntoBuffer: (void *)buffer length: (size_t)length;
 
 /**
  * @brief Asynchronously receives a packet and stores it into the specified
  *	  buffer.
  *
@@ -188,12 +187,11 @@
  * If the buffer is too small, the receive operation fails.
  *
  * @param buffer The buffer to write the packet to
  * @param length The length of the buffer
  */
-- (void)asyncReceiveIntoBuffer: (void *)buffer
-			length: (size_t)length;
+- (void)asyncReceiveIntoBuffer: (void *)buffer length: (size_t)length;
 
 /**
  * @brief Asynchronously receives a packet and stores it into the specified
  *	  buffer.
  *
@@ -255,12 +253,11 @@
  * @brief Sends the specified packet.
  *
  * @param buffer The buffer to send as a packet
  * @param length The length of the buffer
  */
-- (void)sendBuffer: (const void *)buffer
-	    length: (size_t)length;
+- (void)sendBuffer: (const void *)buffer length: (size_t)length;
 
 /**
  * @brief Asynchronously sends the specified packet.
  *
  * @param data The data to send as a packet

Index: src/OFSet.h
==================================================================
--- src/OFSet.h
+++ src/OFSet.h
@@ -237,12 +237,11 @@
  * @note A @ref OFNull value is translated to nil!
  *
  * @param value The value for the specified key
  * @param key The key of the value to set
  */
-- (void)setValue: (nullable id)value
-	  forKey: (OFString *)key;
+- (void)setValue: (nullable id)value forKey: (OFString *)key;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * @brief Executes a block for each object in the set.
  *

Index: src/OFSubarray.h
==================================================================
--- src/OFSubarray.h
+++ src/OFSubarray.h
@@ -21,12 +21,10 @@
 {
 	OFArray *_array;
 	of_range_t _range;
 }
 
-+ (instancetype)arrayWithArray: (OFArray *)array
-			 range: (of_range_t)range;
-- (instancetype)initWithArray: (OFArray *)array
-			range: (of_range_t)range;
++ (instancetype)arrayWithArray: (OFArray *)array range: (of_range_t)range;
+- (instancetype)initWithArray: (OFArray *)array range: (of_range_t)range;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -149,21 +149,19 @@
  * @brief Connect the OFTCPSocket to the specified destination.
  *
  * @param host The host to connect to
  * @param port The port on the host to connect to
  */
-- (void)connectToHost: (OFString *)host
-		 port: (uint16_t)port;
+- (void)connectToHost: (OFString *)host port: (uint16_t)port;
 
 /**
  * @brief Asynchronously connect the OFTCPSocket to the specified destination.
  *
  * @param host The host to connect to
  * @param port The port on the host to connect to
  */
-- (void)asyncConnectToHost: (OFString *)host
-		      port: (uint16_t)port;
+- (void)asyncConnectToHost: (OFString *)host port: (uint16_t)port;
 
 /**
  * @brief Asynchronously connect the OFTCPSocket to the specified destination.
  *
  * @param host The host to connect to
@@ -207,12 +205,11 @@
  *	       IPv6 to bind to all.
  * @param port The port to bind to. If the port is 0, an unused port will be
  *	       chosen, which can be obtained using the return value.
  * @return The port the socket was bound to
  */
-- (uint16_t)bindToHost: (OFString *)host
-		  port: (uint16_t)port;
+- (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: src/OFTarArchive.h
==================================================================
--- src/OFTarArchive.h
+++ src/OFTarArchive.h
@@ -63,12 +63,11 @@
  * @param mode The mode for the tar file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFTarArchive
  */
-+ (instancetype)archiveWithStream: (OFStream *)stream
-			     mode: (OFString *)mode;
++ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Creates a new OFTarArchive object with the specified file.
  *
@@ -76,12 +75,11 @@
  * @param mode The mode for the tar file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFTarArchive
  */
-+ (instancetype)archiveWithPath: (OFString *)path
-			   mode: (OFString *)mode;
++ (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode;
 #endif
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
@@ -107,12 +105,11 @@
  * @param mode The mode for the tar file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFTarArchive
  */
-- (instancetype)initWithPath: (OFString *)path
-			mode: (OFString *)mode;
+- (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode;
 #endif
 
 /**
  * @brief Returns the next entry from the tar archive or `nil` if all entries
  *	  have been read.

Index: src/OFUDPSocket.h
==================================================================
--- src/OFUDPSocket.h
+++ src/OFUDPSocket.h
@@ -70,10 +70,9 @@
  *	       IPv6 to bind to all.
  * @param port The port to bind to. If the port is 0, an unused port will be
  *	       chosen, which can be obtained using the return value.
  * @return The port the socket was bound to
  */
-- (uint16_t)bindToHost: (OFString *)host
-		  port: (uint16_t)port;
+- (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFURL.h
==================================================================
--- src/OFURL.h
+++ src/OFURL.h
@@ -187,12 +187,11 @@
  *
  * @param string A string describing a URL
  * @param URL An URL to which the string is relative
  * @return A new, autoreleased OFURL
  */
-+ (instancetype)URLWithString: (OFString *)string
-		relativeToURL: (OFURL *)URL;
++ (instancetype)URLWithString: (OFString *)string relativeToURL: (OFURL *)URL;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Creates a new URL with the specified local file path.
  *
@@ -230,12 +229,11 @@
  *
  * @param string A string describing a URL
  * @param URL A URL to which the string is relative
  * @return An initialized OFURL
  */
-- (instancetype)initWithString: (OFString *)string
-		 relativeToURL: (OFURL *)URL;
+- (instancetype)initWithString: (OFString *)string relativeToURL: (OFURL *)URL;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Initializes an already allocated OFURL with the specified local file
  *	  path.

Index: src/OFURLHandler.h
==================================================================
--- src/OFURLHandler.h
+++ src/OFURLHandler.h
@@ -49,12 +49,11 @@
  * @param class_ The class to register as the handler for the specified scheme
  * @param scheme The scheme for which to register the handler
  * @return Whether the class was successfully registered. If a handler for the
  *	   same scheme is already registered, registration fails.
  */
-+ (bool)registerClass: (Class)class_
-	    forScheme: (OFString *)scheme;
++ (bool)registerClass: (Class)class_ forScheme: (OFString *)scheme;
 
 /**
  * @brief Returns the handler for the specified URL.
  *
  * @return The handler for the specified URL.
@@ -90,12 +89,11 @@
  *	       `a+`           | Read-write, create or append
  *	       @n
  *	       The handler is allowed to not implement all modes and is also
  *	       allowed to implement additional, scheme-specific modes.
  */
-- (OFStream *)openItemAtURL: (OFURL *)URL
-		       mode: (OFString *)mode;
+- (OFStream *)openItemAtURL: (OFURL *)URL mode: (OFString *)mode;
 
 /**
  * @brief Returns the attributes for the item at the specified URL.
  *
  * @param URL The URL to return the attributes for
@@ -166,12 +164,11 @@
  * This method is not available for all URLs.
  *
  * @param source The URL to the item for which a link should be created
  * @param destination The URL to the item which should link to the source
  */
-- (void)linkItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (void)linkItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 /**
  * @brief Creates a symbolic link for an item.
  *
  * The destination uRL must have a full path, which means it must include the
@@ -203,12 +200,11 @@
  * @param destination The destination URL
  * @return True if an efficient copy was performed, false if an efficient copy
  *	   was not possible. Note that errors while performing a copy are
  *	   reported via exceptions and not by returning false!
  */
-- (bool)copyItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (bool)copyItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 
 /**
  * @brief Tries to efficiently move an item. If a move would only be possible
  *	  by copying the source and deleting it, it returns false.
  *
@@ -222,10 +218,9 @@
  * @param destination The new name for the item
  * @return True if an efficient move was performed, false if an efficient move
  *	   was not possible. Note that errors while performing a move are
  *	   reported via exceptions and not by returning false!
  */
-- (bool)moveItemAtURL: (OFURL *)source
-		toURL: (OFURL *)destination;
+- (bool)moveItemAtURL: (OFURL *)source toURL: (OFURL *)destination;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFValue.h
==================================================================
--- src/OFValue.h
+++ src/OFValue.h
@@ -218,15 +218,14 @@
  * @ref OFOutOfRangeException.
  *
  * @param value The buffer to copy the value into
  * @param size The size of the value
  */
-- (void)getValue: (void *)value
-	    size: (size_t)size;
+- (void)getValue: (void *)value size: (size_t)size;
 @end
 
 OF_ASSUME_NONNULL_END
 
 #if !defined(NSINTEGER_DEFINED) && !__has_feature(modules)
 /* Required for array literals to work */
 @compatibility_alias NSValue OFValue;
 #endif

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -230,21 +230,19 @@
  * @brief Sets a prefix for a namespace.
  *
  * @param prefix The prefix for the namespace
  * @param namespace_ The namespace for which the prefix is set
  */
-- (void)setPrefix: (OFString *)prefix
-     forNamespace: (OFString *)namespace_;
+- (void)setPrefix: (OFString *)prefix forNamespace: (OFString *)namespace_;
 
 /**
  * @brief Binds a prefix for a namespace.
  *
  * @param prefix The prefix for the namespace
  * @param namespace_ The namespace for which the prefix is bound
  */
-- (void)bindPrefix: (OFString *)prefix
-      forNamespace: (OFString *)namespace_;
+- (void)bindPrefix: (OFString *)prefix forNamespace: (OFString *)namespace_;
 
 /**
  * @brief Adds the specified attribute.
  *
  * If an attribute with the same name and namespace already exists, it is not
@@ -326,12 +324,11 @@
  * @brief Inserts a child at the specified index.
  *
  * @param child An OFXMLNode which is added as a child
  * @param index The index where the child is added
  */
-- (void)insertChild: (OFXMLNode *)child
-	    atIndex: (size_t)index;
+- (void)insertChild: (OFXMLNode *)child atIndex: (size_t)index;
 
 /**
  * @brief Inserts the specified children at the specified index.
  *
  * @param children An array of OFXMLNodes which are added as children
@@ -359,21 +356,19 @@
  *	  with the specified node.
  *
  * @param child The child to replace
  * @param node The node to replace the child with
  */
-- (void)replaceChild: (OFXMLNode *)child
-	    withNode: (OFXMLNode *)node;
+- (void)replaceChild: (OFXMLNode *)child withNode: (OFXMLNode *)node;
 
 /**
  * @brief Replaces the child at the specified index with the specified node.
  *
  * @param index The index of the child to replace
  * @param node The node to replace the child with
  */
-- (void)replaceChildAtIndex: (size_t)index
-		   withNode: (OFXMLNode *)node;
+- (void)replaceChildAtIndex: (size_t)index withNode: (OFXMLNode *)node;
 
 /**
  * @brief Returns all children that have the specified namespace.
  *
  * @return All children that have the specified namespace

Index: src/OFXMLParser.h
==================================================================
--- src/OFXMLParser.h
+++ src/OFXMLParser.h
@@ -80,30 +80,27 @@
  * called multiple times in a row.
  *
  * @param parser The parser which found a string
  * @param characters The characters the XML parser found
  */
--    (void)parser: (OFXMLParser *)parser
-  foundCharacters: (OFString *)characters;
+- (void)parser: (OFXMLParser *)parser foundCharacters: (OFString *)characters;
 
 /**
  * @brief This callback is called when the XML parser found CDATA.
  *
  * @param parser The parser which found a string
  * @param CDATA The CDATA the XML parser found
  */
-- (void)parser: (OFXMLParser *)parser
-    foundCDATA: (OFString *)CDATA;
+- (void)parser: (OFXMLParser *)parser foundCDATA: (OFString *)CDATA;
 
 /**
  * @brief This callback is called when the XML parser found a comment.
  *
  * @param parser The parser which found a comment
  * @param comment The comment the XML parser found
  */
-- (void)parser: (OFXMLParser *)parser
-  foundComment: (OFString *)comment;
+- (void)parser: (OFXMLParser *)parser foundComment: (OFString *)comment;
 
 /**
  * @brief This callback is called when the XML parser found an entity it
  *	  doesn't know.
  *
@@ -208,12 +205,11 @@
  * @brief Parses the specified buffer with the specified size.
  *
  * @param buffer The buffer to parse
  * @param length The length of the buffer
  */
-- (void)parseBuffer: (const char *)buffer
-	     length: (size_t)length;
+- (void)parseBuffer: (const char *)buffer length: (size_t)length;
 
 /**
  * @brief Parses the specified string.
  *
  * @param string The string to parse

Index: src/OFZIPArchive.h
==================================================================
--- src/OFZIPArchive.h
+++ src/OFZIPArchive.h
@@ -74,12 +74,11 @@
  * @param mode The mode for the ZIP file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFZIPArchive
  */
-+ (instancetype)archiveWithStream: (OFStream *)stream
-			     mode: (OFString *)mode;
++ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
 
 #ifdef OF_HAVE_FILES
 /**
  * @brief Creates a new OFZIPArchive object with the specified file.
  *
@@ -87,12 +86,11 @@
  * @param mode The mode for the ZIP file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFZIPArchive
  */
-+ (instancetype)archiveWithPath: (OFString *)path
-			   mode: (OFString *)mode;
++ (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode;
 #endif
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
@@ -118,12 +116,11 @@
  * @param mode The mode for the ZIP file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFZIPArchive
  */
-- (instancetype)initWithPath: (OFString *)path
-			mode: (OFString *)mode;
+- (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode;
 #endif
 
 /**
  * @brief Returns a stream for reading the specified file from the archive.
  *

Index: src/exceptions/OFAcceptFailedException.h
==================================================================
--- src/exceptions/OFAcceptFailedException.h
+++ src/exceptions/OFAcceptFailedException.h
@@ -50,12 +50,11 @@
  *
  * @param socket The socket which could not accept a connection
  * @param errNo The errno for the error
  * @return A new, autoreleased accept failed exception
  */
-+ (instancetype)exceptionWithSocket: (id)socket
-			      errNo: (int)errNo;
++ (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated accept failed exception.

Index: src/exceptions/OFChangeCurrentDirectoryPathFailedException.h
==================================================================
--- src/exceptions/OFChangeCurrentDirectoryPathFailedException.h
+++ src/exceptions/OFChangeCurrentDirectoryPathFailedException.h
@@ -51,12 +51,11 @@
  * @param path The path of the directory to which the current path could not be
  *	       changed
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased change current directory path failed exception
  */
-+ (instancetype)exceptionWithPath: (OFString *)path
-			    errNo: (int)errNo;
++ (instancetype)exceptionWithPath: (OFString *)path errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated change directory failed exception.

Index: src/exceptions/OFCreateDirectoryFailedException.h
==================================================================
--- src/exceptions/OFCreateDirectoryFailedException.h
+++ src/exceptions/OFCreateDirectoryFailedException.h
@@ -49,12 +49,11 @@
  *
  * @param URL The URL of the directory which could not be created
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased create directory failed exception
  */
-+ (instancetype)exceptionWithURL: (OFURL *)URL
-			   errNo: (int)errNo;
++ (instancetype)exceptionWithURL: (OFURL *)URL errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated create directory failed exception.

Index: src/exceptions/OFGetOptionFailedException.h
==================================================================
--- src/exceptions/OFGetOptionFailedException.h
+++ src/exceptions/OFGetOptionFailedException.h
@@ -46,12 +46,11 @@
  *
  * @param object The object for which the option could not be retrieved
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased get option failed exception
  */
-+ (instancetype)exceptionWithObject: (id)object
-			      errNo: (int)errNo;
++ (instancetype)exceptionWithObject: (id)object errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated get option failed exception.

Index: src/exceptions/OFRemoveItemFailedException.h
==================================================================
--- src/exceptions/OFRemoveItemFailedException.h
+++ src/exceptions/OFRemoveItemFailedException.h
@@ -48,12 +48,11 @@
  *
  * @param URL The URL of the item which could not be removed
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased remove item failed exception
  */
-+ (instancetype)exceptionWithURL: (OFURL *)URL
-			   errNo: (int)errNo;
++ (instancetype)exceptionWithURL: (OFURL *)URL errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated remove failed exception.

Index: src/exceptions/OFRetrieveItemAttributesFailedException.h
==================================================================
--- src/exceptions/OFRetrieveItemAttributesFailedException.h
+++ src/exceptions/OFRetrieveItemAttributesFailedException.h
@@ -49,12 +49,11 @@
  *
  * @param URL The URL of the item whose attributes could not be retrieved
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased retrieve item attributes failed exception
  */
-+ (instancetype)exceptionWithURL: (OFURL *)URL
-			   errNo: (int)errNo;
++ (instancetype)exceptionWithURL: (OFURL *)URL errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated retrieve item attributes failed

Index: src/exceptions/OFSandboxActivationFailedException.h
==================================================================
--- src/exceptions/OFSandboxActivationFailedException.h
+++ src/exceptions/OFSandboxActivationFailedException.h
@@ -49,12 +49,11 @@
  *
  * @param sandbox The sandbox which could not be activated
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased sandboxing failed exception
  */
-+ (instancetype)exceptionWithSandbox: (OFSandbox *)sandbox
-			       errNo: (int)errNo;
++ (instancetype)exceptionWithSandbox: (OFSandbox *)sandbox errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated sandboxing failed exception.

Index: src/exceptions/OFSetOptionFailedException.h
==================================================================
--- src/exceptions/OFSetOptionFailedException.h
+++ src/exceptions/OFSetOptionFailedException.h
@@ -46,12 +46,11 @@
  *
  * @param object The object for which the option could not be set
  * @param errNo The errno of the error that occurred
  * @return A new, autoreleased set option failed exception
  */
-+ (instancetype)exceptionWithObject: (id)object
-			      errNo: (int)errNo;
++ (instancetype)exceptionWithObject: (id)object errNo: (int)errNo;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated set option failed exception.

Index: src/exceptions/OFUndefinedKeyException.h
==================================================================
--- src/exceptions/OFUndefinedKeyException.h
+++ src/exceptions/OFUndefinedKeyException.h
@@ -54,12 +54,11 @@
  * @param object The object on which the key is undefined
  * @param key The key which is undefined
  *
  * @return A new, autoreleased undefined key exception
  */
-+ (instancetype)exceptionWithObject: (id)object
-				key: (OFString *)key;
++ (instancetype)exceptionWithObject: (id)object key: (OFString *)key;
 
 /**
  * @brief Creates a new, autoreleased undefined key exception.
  *
  * @param object The object on which the key is undefined
@@ -80,12 +79,11 @@
  * @param object The object on which the key is undefined
  * @param key The key which is undefined
  *
  * @return An initialized undefined key exception
  */
-- (instancetype)initWithObject: (id)object
-			   key: (OFString *)key;
+- (instancetype)initWithObject: (id)object key: (OFString *)key;
 
 /**
  * @brief Initializes an already allocated undefined key exception.
  *
  * @param object The object on which the key is undefined