@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017
+ * Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
  *   Jonathan Schleifer <js@heap.zone>
  *
  * https://heap.zone/git/objpgsql.git
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -33,21 +33,21 @@
 			return [OFNumber numberWithBool: YES];
 		else
 			return [OFNumber numberWithBool: NO];
 	case 21:  /* INT2OID */
 		return [OFNumber numberWithInt16:
-		    (int16_t)[string decimalValue]];
+		    (int16_t)string.decimalValue];
 	case 23:  /* INT4OID */
 		return [OFNumber numberWithInt32:
-		    (int32_t)[string decimalValue]];
+		    (int32_t)string.decimalValue];
 	case 20:  /* INT8OID */
 		return [OFNumber numberWithInt64:
-		    (int64_t)[string decimalValue]];
+		    (int64_t)string.decimalValue];
 	case 700: /* FLOAT4OID */
-		return [OFNumber numberWithFloat: [string floatValue]];
+		return [OFNumber numberWithFloat: string.floatValue];
 	case 701: /* FLOAT8OID */
-		return [OFNumber numberWithDouble: [string doubleValue]];
+		return [OFNumber numberWithDouble: string.doubleValue];
 	}
 
 	return string;
 }
 
@@ -74,17 +74,17 @@
 {
 	return [[[self alloc] initWithResult: result
 					 row: row] autorelease];
 }
 
-- initWithResult: (PGResult *)result
-	     row: (int)row
+- (instancetype)initWithResult: (PGResult *)result
+			   row: (int)row
 {
 	self = [super init];
 
 	_result = [result retain];
-	_res = [result pg_result];
+	_res = result.pg_result;
 	_row = row;
 
 	return self;
 }
 
@@ -168,17 +168,17 @@
 	return j;
 }
 @end
 
 @implementation PGResultRowEnumerator
-- initWithResult: (PGResult *)result
-	     row: (int)row
+- (instancetype)initWithResult: (PGResult *)result
+			   row: (int)row
 {
 	self = [super init];
 
 	_result = [result retain];
-	_res = [result pg_result];
+	_res = result.pg_result;
 	_row = row;
 	_count = PQnfields(_res);
 
 	return self;
 }