@@ -106,11 +106,11 @@
 
 	[connection connect];
 
 	[self performSelector: @selector(didConnect)
 		     onThread: sourceThread
-		waitUntilDone: NO];
+		waitUntilDone: false];
 
 	[pool release];
 
 	return nil;
 }
@@ -126,12 +126,10 @@
 {
 	self = [super init];
 
 	@try {
 		_port = 5222;
-		_encrypted = NO;
-		_streamOpen = NO;
 		_delegates = [[XMPPMulticastDelegate alloc] init];
 		_callbacks = [[OFMutableDictionary alloc] init];
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -307,26 +305,26 @@
 	return [[_password copy] autorelease];
 }
 
 - (void)setPrivateKeyFile: (OFString*)privateKeyFile
 {
-	OF_SETTER(_privateKeyFile, privateKeyFile, YES, YES)
+	OF_SETTER(_privateKeyFile, privateKeyFile, true, 1)
 }
 
 - (OFString*)privateKeyFile
 {
-	OF_GETTER(_privateKeyFile, YES)
+	OF_GETTER(_privateKeyFile, true)
 }
 
 - (void)setCertificateFile: (OFString*)certificateFile
 {
-	OF_SETTER(_certificateFile, certificateFile, YES, YES)
+	OF_SETTER(_certificateFile, certificateFile, true, 1)
 }
 
 - (OFString*)certificateFile
 {
-	OF_GETTER(_certificateFile, YES)
+	OF_GETTER(_certificateFile, true)
 }
 
 - (void)connect
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
@@ -395,30 +393,30 @@
 		      connection: self] autorelease] start];
 
 	[pool release];
 }
 
--  (BOOL)XMPP_parseBuffer: (const void*)buffer
+-  (bool)XMPP_parseBuffer: (const void*)buffer
 		   length: (size_t)length
 {
 	if ([_socket isAtEndOfStream]) {
 		[_delegates broadcastSelector: @selector(connectionWasClosed:)
 				   withObject: self];
-		return NO;
+		return false;
 	}
 
 	@try {
 		[_parser parseBuffer: buffer
 			     length: length];
 	} @catch (OFMalformedXMLException *e) {
 		[self XMPP_sendStreamError: @"bad-format"
 				      text: nil];
 		[self close];
-		return NO;
+		return false;
 	}
 
-	return YES;
+	return true;
 }
 
 - (void)parseBuffer: (const void*)buffer
 	     length: (size_t)length
 {
@@ -430,11 +428,11 @@
 
 	_oldParser = nil;
 	_oldElementBuilder = nil;
 }
 
--      (BOOL)stream: (OFStream*)stream
+-      (bool)stream: (OFStream*)stream
   didReadIntoBuffer: (char*)buffer
 	     length: (size_t)length
 	  exception: (OFException*)exception
 {
 	if (exception != nil) {
@@ -441,24 +439,24 @@
 		[_delegates broadcastSelector: @selector(connection:
 						   didThrowException:)
 				   withObject: self
 				   withObject: exception];
 		[self close];
-		return NO;
+		return false;
 	}
 
 	@try {
 		if (![self XMPP_parseBuffer: buffer
 				     length: length])
-			return NO;
+			return false;
 	} @catch (id e) {
 		[_delegates broadcastSelector: @selector(connection:
 						   didThrowException:)
 				   withObject: self
 				   withObject: e];
 		[self close];
-		return NO;
+		return false;
 	}
 
 	if (_oldParser != nil || _oldElementBuilder != nil) {
 		[_oldParser release];
 		[_oldElementBuilder release];
@@ -471,85 +469,85 @@
 				      target: self
 				    selector: @selector(stream:
 						  didReadIntoBuffer:length:
 						  exception:)];
 
-		return NO;
+		return false;
 	}
 
-	return YES;
+	return true;
 }
 
 - (OFTCPSocket*)socket
 {
 	return [[_socket retain] autorelease];
 }
 
-- (BOOL)encryptionRequired
+- (bool)encryptionRequired
 {
 	return _encryptionRequired;
 }
 
-- (void)setEncryptionRequired: (BOOL)encryptionRequired
+- (void)setEncryptionRequired: (bool)encryptionRequired
 {
 	_encryptionRequired = encryptionRequired;
 }
 
-- (BOOL)encrypted
+- (bool)encrypted
 {
 	return _encrypted;
 }
 
-- (BOOL)streamOpen
+- (bool)streamOpen
 {
 	return _streamOpen;
 }
 
-- (BOOL)supportsRosterVersioning
+- (bool)supportsRosterVersioning
 {
 	return _supportsRosterVersioning;
 }
 
-- (BOOL)supportsStreamManagement
+- (bool)supportsStreamManagement
 {
 	return _supportsStreamManagement;
 }
 
-- (BOOL)checkCertificateAndGetReason: (OFString**)reason
+- (bool)checkCertificateAndGetReason: (OFString**)reason
 {
 	X509Certificate *cert;
 	OFDictionary *SANs;
-	BOOL serviceSpecific = NO;
+	bool serviceSpecific = false;
 
 	@try {
 		[_socket verifyPeerCertificate];
 	} @catch (SSLInvalidCertificateException *e) {
 		if (reason != NULL)
 			*reason = [[[e reason] copy] autorelease];
 
-		return NO;
+		return false;
 	}
 
 	cert = [_socket peerCertificate];
 	SANs = [cert subjectAlternativeName];
 
 	if ([[SANs objectForKey: @"otherName"]
 		objectForKey: OID_SRVName] != nil ||
 	     [SANs objectForKey: @"dNSName"] != nil ||
 	     [SANs objectForKey: @"uniformResourceIdentifier"] != nil)
-		serviceSpecific = YES;
+		serviceSpecific = true;
 
 	if ([cert hasSRVNameMatchingDomain: _domainToASCII
 				   service: @"xmpp-client"] ||
 	    [cert hasDNSNameMatchingDomain: _domainToASCII])
-		return YES;
+		return true;
 
 	if (!serviceSpecific &&
 	    [cert hasCommonNameMatchingDomain: _domainToASCII])
-		return YES;
+		return true;
 
-	return NO;
+	return false;
 }
 
 - (void)sendStanza: (OFXMLElement*)element
 {
 	[_delegates broadcastSelector: @selector(connection:didSendElement:)
@@ -721,11 +719,11 @@
 			      @"<stream:stream to='%@' "
 			      @"xmlns='" XMPP_NS_CLIENT @"' "
 			      @"xmlns:stream='" XMPP_NS_STREAM @"' %@"
 			      @"version='1.0'>", _domain, langString];
 
-	_streamOpen = YES;
+	_streamOpen = true;
 }
 
 - (void)close
 {
 	if (_streamOpen)
@@ -740,12 +738,12 @@
 	_authModule = nil;
 	[_socket release];
 	_socket = nil;
 	[_JID release];
 	_JID = nil;
-	_streamOpen = _needsSession = _encrypted = NO;
-	_supportsRosterVersioning = _supportsStreamManagement = NO;
+	_streamOpen = _needsSession = _encrypted = false;
+	_supportsRosterVersioning = _supportsStreamManagement = false;
 	_lastID = 0;
 }
 
 - (void)XMPP_handleStanza: (OFXMLElement*)element
 {
@@ -891,11 +889,11 @@
 		[newSock setPrivateKeyPassphrase: _privateKeyPassphrase];
 		[newSock startTLS];
 		[_socket release];
 		_socket = newSock;
 
-		_encrypted = YES;
+		_encrypted = true;
 
 		[_delegates broadcastSelector: @selector(
 						   connectionDidUpgradeToTLS:)
 				   withObject: self];
 
@@ -960,11 +958,11 @@
 	assert(0);
 }
 
 - (void)XMPP_handleIQ: (XMPPIQ*)iq
 {
-	BOOL handled = NO;
+	bool handled = false;
 	XMPPCallback *callback;
 
 	if ((callback = [_callbacks objectForKey: [iq ID]])) {
 		[callback runWithIQ: iq
 			 connection: self];
@@ -1021,15 +1019,15 @@
 		/* TODO: Find/create an exception to throw here */
 		@throw [OFException exception];
 
 	if ([element elementForName: @"ver"
 			  namespace: XMPP_NS_ROSTERVER] != nil)
-		_supportsRosterVersioning = YES;
+		_supportsRosterVersioning = true;
 
 	if ([element elementForName: @"sm"
 			  namespace: XMPP_NS_SM] != nil)
-		_supportsStreamManagement = YES;
+		_supportsStreamManagement = true;
 
 	if (mechs != nil) {
 		OFEnumerator *enumerator;
 		OFXMLElement *mech;
 
@@ -1048,11 +1046,11 @@
 			_authModule = [[XMPPSCRAMAuth alloc]
 			    initWithAuthcid: _username
 				   password: _password
 				 connection: self
 				       hash: [OFSHA1Hash class]
-			      plusAvailable: YES];
+			      plusAvailable: true];
 			[self XMPP_sendAuth: @"SCRAM-SHA-1-PLUS"];
 			return;
 		}
 
 		if ([mechanisms containsObject: @"SCRAM-SHA-1"]) {
@@ -1059,11 +1057,11 @@
 			_authModule = [[XMPPSCRAMAuth alloc]
 			    initWithAuthcid: _username
 				   password: _password
 				 connection: self
 				       hash: [OFSHA1Hash class]
-			      plusAvailable: NO];
+			      plusAvailable: false];
 			[self XMPP_sendAuth: @"SCRAM-SHA-1"];
 			return;
 		}
 
 		if ([mechanisms containsObject: @"PLAIN"] && _encrypted) {
@@ -1076,11 +1074,11 @@
 
 		assert(0);
 	}
 
 	if (session != nil)
-		_needsSession = YES;
+		_needsSession = true;
 
 	if (bind != nil) {
 		[self XMPP_sendResourceBind];
 		return;
 	}
@@ -1254,16 +1252,16 @@
 	return _dataStorage;
 }
 
 - (void)setLanguage: (OFString*)language
 {
-	OF_SETTER(_language, language, YES, YES)
+	OF_SETTER(_language, language, true, 1)
 }
 
 - (OFString*)language
 {
-	OF_GETTER(_language, YES)
+	OF_GETTER(_language, true)
 }
 
 - (void)addDelegate: (id <XMPPConnectionDelegate>)delegate
 {
 	[_delegates addDelegate: delegate];