diff --git a/libvips/resample/bicubic.cpp b/libvips/resample/bicubic.cpp
index 1f3f250f..83c71028 100644
--- a/libvips/resample/bicubic.cpp
+++ b/libvips/resample/bicubic.cpp
@@ -429,11 +429,11 @@ vips_interpolate_bicubic_class_init( VipsInterpolateBicubicClass *iclass )
 	VipsInterpolateClass *interpolate_class =
 		VIPS_INTERPOLATE_CLASS( iclass );
 
-	object_class->nickname = "bicubic";
+	object_class->nickname    = "bicubic";
 	object_class->description = _( "Bicubic interpolation (Catmull-Rom)" );
 
-	interpolate_class->interpolate = vips_interpolate_bicubic_interpolate;
-	interpolate_class->window_size = 4;
+	interpolate_class->interpolate   = vips_interpolate_bicubic_interpolate;
+	interpolate_class->window_size   = 4;
 	interpolate_class->window_offset = 1;
 
 	/* Build the tables of pre-computed coefficients.
diff --git a/libvips/resample/interpolate.c b/libvips/resample/interpolate.c
index 05c5bfac..e37fc9c1 100644
--- a/libvips/resample/interpolate.c
+++ b/libvips/resample/interpolate.c
@@ -269,7 +269,7 @@ vips_interpolate_nearest_new( void )
 /* Convenience: return a static nearest you don't need to free.
  */
 VipsInterpolate *
-vips_interpolate_nearest_static( void )
+<vips_interpolate_nearest_static( void )
 {
 	static VipsInterpolate *interpolate = NULL;
 
diff --git a/libvips/resample/lbb.cpp b/libvips/resample/lbb.cpp
index 07a5099a..1c2ba488 100644
--- a/libvips/resample/lbb.cpp
+++ b/libvips/resample/lbb.cpp
@@ -791,11 +791,11 @@ vips_interpolate_lbb_class_init( VipsInterpolateLbbClass *klass )
   VipsInterpolateClass *interpolate_class =
     VIPS_INTERPOLATE_CLASS( klass );
 
-  object_class->nickname = "lbb";
+  object_class->nickname    = "lbb";
   object_class->description = _( "Reduced halo bicubic" );
 
-  interpolate_class->interpolate = vips_interpolate_lbb_interpolate;
-  interpolate_class->window_size = 4;
+  interpolate_class->interpolate   = vips_interpolate_lbb_interpolate;
+  interpolate_class->window_size   = 4;
   interpolate_class->window_offset = 1;
 }
 
diff --git a/libvips/resample/nohalo1.cpp b/libvips/resample/nohalo1.cpp
index 2a7eb691..6a4485b3 100644
--- a/libvips/resample/nohalo1.cpp
+++ b/libvips/resample/nohalo1.cpp
@@ -652,11 +652,11 @@ vips_interpolate_nohalo1_class_init( VipsInterpolateNohalo1Class *klass )
   VipsInterpolateClass *interpolate_class =
     VIPS_INTERPOLATE_CLASS( klass );
 
-  object_class->nickname = "nohalo1";
+  object_class->nickname    = "nohalo1";
   object_class->description = _( "Edge-enhancing bilinear" );
 
-  interpolate_class->interpolate = vips_interpolate_nohalo1_interpolate;
-  interpolate_class->window_size = 4;
+  interpolate_class->interpolate   = vips_interpolate_nohalo1_interpolate;
+  interpolate_class->window_size   = 4;
   interpolate_class->window_offset = 1;
 }
 
diff --git a/libvips/resample/nohalo2.cpp b/libvips/resample/nohalo2.cpp
index 48c43e20..229c0cd0 100644
--- a/libvips/resample/nohalo2.cpp
+++ b/libvips/resample/nohalo2.cpp
@@ -1078,11 +1078,11 @@ vips_interpolate_nohalo2_class_init( VipsInterpolateNohalo2Class *klass )
   gobject_class->set_property = vips_object_set_property;
   gobject_class->get_property = vips_object_get_property;
 
-  object_class->nickname = "nohalo2";
+  object_class->nickname    = "nohalo2";
   object_class->description = _( "Smoother and more edge-enhancing nohalo1" );
 
-  interpolate_class->interpolate = vips_interpolate_nohalo2_interpolate;
-  interpolate_class->window_size = 6;
+  interpolate_class->interpolate   = vips_interpolate_nohalo2_interpolate;
+  interpolate_class->window_size   = 6;
   interpolate_class->window_offset = 2;
 }
 
diff --git a/libvips/resample/snohalo1.cpp b/libvips/resample/snohalo1.cpp
index e5db0ef4..ae56663b 100644
--- a/libvips/resample/snohalo1.cpp
+++ b/libvips/resample/snohalo1.cpp
@@ -1090,13 +1090,12 @@ vips_interpolate_snohalo1_class_init( VipsInterpolateSnohalo1Class *klass )
   gobject_class->set_property = vips_object_set_property;
   gobject_class->get_property = vips_object_get_property;
 
-  object_class->nickname = "snohalo1";
+  object_class->nickname    = "snohalo1";
   object_class->description = _( "Nohalo level 2 with antialiasing blur" );
 
-  interpolate_class->interpolate =
-    vips_interpolate_snohalo1_interpolate;
-  interpolate_class->window_size = 7;
-  interpolate_class->window_size = 3;
+  interpolate_class->interpolate   = vips_interpolate_snohalo1_interpolate;
+  interpolate_class->window_size   = 7;
+  interpolate_class->window_offset = 3;
 
   /*
    * Create properties: