@@ -144,10 +144,12 @@
 	[attribute->_namespace release];
 	attribute->_namespace = [attributeNS retain];
 }
 
 @implementation OFXMLParser
+@synthesize delegate = _delegate, depthLimit = _depthLimit;
+
 + (void)initialize
 {
 	size_t i;
 
 	const SEL selectors_[OF_XMLPARSER_NUM_STATES] = {
@@ -234,30 +236,10 @@
 	[_previous release];
 
 	[super dealloc];
 }
 
-- (id <OFXMLParserDelegate>)delegate
-{
-	return _delegate;
-}
-
-- (void)setDelegate: (id <OFXMLParserDelegate>)delegate
-{
-	_delegate = delegate;
-}
-
-- (size_t)depthLimit
-{
-	return _depthLimit;
-}
-
-- (void)setDepthLimit: (size_t)depthLimit
-{
-	_depthLimit = depthLimit;
-}
-
 - (void)parseBuffer: (const char*)buffer
 	     length: (size_t)length
 {
 	_data = buffer;
 
@@ -1041,11 +1023,11 @@
 - (size_t)lineNumber
 {
 	return _lineNumber;
 }
 
-- (bool)finishedParsing
+- (bool)hasFinishedParsing
 {
 	return _finishedParsing;
 }
 
 -	   (OFString*)string: (OFString*)string