@@ -104,17 +104,16 @@
 	    @"    room_id TEXT,\n"
 	    @"    PRIMARY KEY (user_id, room_id)\n"
 	    @");"];
 }
 
-- (void)transactionWithBlock: (mtx_storage_transaction_block_t)block
+- (void)transactionWithBlock: (MTXStorageTransactionBlock)block
 {
 	[_conn transactionWithBlock: block];
 }
 
-- (void)setNextBatch: (OFString *)nextBatch
-	 forDeviceID: (OFString *)deviceID
+- (void)setNextBatch: (OFString *)nextBatch forDeviceID: (OFString *)deviceID
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[_nextBatchSetStatement reset];
 	[_nextBatchSetStatement bindWithDictionary: @{
@@ -144,12 +143,11 @@
 	objc_autoreleasePoolPop(pool);
 
 	return [nextBatch autorelease];
 }
 
-- (void)addJoinedRoom: (OFString *)roomID
-	      forUser: (OFString *)userID
+- (void)addJoinedRoom: (OFString *)roomID forUser: (OFString *)userID
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[_joinedRoomsAddStatement reset];
 	[_joinedRoomsAddStatement bindWithDictionary: @{
@@ -159,12 +157,11 @@
 	[_joinedRoomsAddStatement step];
 
 	objc_autoreleasePoolPop(pool);
 }
 
-- (void)removeJoinedRoom: (OFString *)roomID
-		 forUser: (OFString *)userID
+- (void)removeJoinedRoom: (OFString *)roomID forUser: (OFString *)userID
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	[_joinedRoomsRemoveStatement reset];
 	[_joinedRoomsRemoveStatement bindWithDictionary: @{
@@ -180,13 +177,11 @@
 {
 	OFMutableArray *joinedRooms = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
 
 	[_joinedRoomsGetStatement reset];
-	[_joinedRoomsGetStatement bindWithDictionary: @{
-		@"$user_id": userID
-	}];
+	[_joinedRoomsGetStatement bindWithDictionary: @{ @"$user_id": userID }];
 
 	while ([_joinedRoomsGetStatement step])
 		[joinedRooms addObject:
 		    _joinedRoomsGetStatement.rowDictionary[@"room_id"]];