diff --git a/frame/include/blis.h b/frame/include/blis.h
index 94da7680c..e20fc5f73 100644
--- a/frame/include/blis.h
+++ b/frame/include/blis.h
@@ -81,7 +81,6 @@ extern "C" {
 // -- BLIS kernel definitions --
 
 #include "bli_kernel.h"
-//#include "bli_kernel_type_defs.h"
 
 #include "bli_kernel_pre_macro_defs.h"
 #include "bli_kernel_ind_pre_macro_defs.h"
diff --git a/kernels/bgq/1/bli_axpyv_opt_var1.c b/kernels/bgq/1/bli_axpyv_opt_var1.c
index 33cd4dc0a..7e2a5b6bd 100644
--- a/kernels/bgq/1/bli_axpyv_opt_var1.c
+++ b/kernels/bgq/1/bli_axpyv_opt_var1.c
@@ -36,12 +36,12 @@
 
 void bli_daxpyv_opt_var1 
      ( 
-       conj_t  conjx,
-       dim_t   n,
-       double* alpha,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       cntx_t* cntx
+       conj_t           conjx,
+       dim_t            n,
+       double* restrict alpha,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       cntx_t*          cntx
      )
 {
 	if ( bli_zero_dim1( n ) ) return;
diff --git a/kernels/bgq/1/bli_dotv_opt_var1.c b/kernels/bgq/1/bli_dotv_opt_var1.c
index 674b1e653..1003c2aa0 100644
--- a/kernels/bgq/1/bli_dotv_opt_var1.c
+++ b/kernels/bgq/1/bli_dotv_opt_var1.c
@@ -36,13 +36,13 @@
 
 void bli_ddotv_opt_var1 
      ( 
-       conj_t  conjx,
-       conj_t  conjy,
-       dim_t   n,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       double* rho,
-       cntx_t* cntx
+       conj_t           conjx,
+       conj_t           conjy,
+       dim_t            n,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       double* restrict rho,
+       cntx_t*          cntx
      )
 { 
 	bool_t use_ref = FALSE;
diff --git a/kernels/bgq/1f/bli_axpyf_opt_var1.c b/kernels/bgq/1f/bli_axpyf_opt_var1.c
index ceff0f32c..25ca9920d 100644
--- a/kernels/bgq/1f/bli_axpyf_opt_var1.c
+++ b/kernels/bgq/1f/bli_axpyf_opt_var1.c
@@ -37,15 +37,15 @@
 
 void bli_daxpyf_opt_var1
      (
-       conj_t  conja,
-       conj_t  conjx,
-       dim_t   m,
-       dim_t   b_n,
-       double* alpha,
-       double* a, inc_t inca, inc_t lda,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       cntx_t* cntx
+       conj_t           conja,
+       conj_t           conjx,
+       dim_t            m,
+       dim_t            b_n,
+       double* restrict alpha,
+       double* restrict a, inc_t inca, inc_t lda,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       cntx_t*          cntx
      )
 {
 	const dim_t fusefac = 8;
diff --git a/kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c b/kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c
index 121068bd5..413b14e20 100644
--- a/kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c
+++ b/kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c
@@ -45,12 +45,12 @@ typedef union
 
 void bli_daxpyv_opt_var1
      ( 
-       conj_t  conjx,
-       dim_t   n,
-       double* alpha,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       cntx_t* cntx
+       conj_t           conjx,
+       dim_t            n,
+       double* restrict alpha,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       cntx_t*          cntx
      )
 {
 	double*  restrict alpha_cast = alpha;
diff --git a/kernels/x86_64/penryn/1/bli_dotv_opt_var1.c b/kernels/x86_64/penryn/1/bli_dotv_opt_var1.c
index 4ce09c4e3..52c532d9d 100644
--- a/kernels/x86_64/penryn/1/bli_dotv_opt_var1.c
+++ b/kernels/x86_64/penryn/1/bli_dotv_opt_var1.c
@@ -45,13 +45,13 @@ typedef union
 
 void bli_ddotv_opt_var1 
      ( 
-       conj_t  conjx,
-       conj_t  conjy,
-       dim_t   n,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       double* rho,
-       cntx_t* cntx
+       conj_t           conjx,
+       conj_t           conjy,
+       dim_t            n,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       double* restrict rho,
+       cntx_t*          cntx
      )
 { 
 	double*  restrict x_cast   = x; 
diff --git a/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c b/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c
index 9674dc4d8..29b7a149f 100644
--- a/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c
@@ -45,15 +45,15 @@ typedef union
 
 void bli_daxpy2v_int_var1
      (
-       conj_t  conjx,
-       conj_t  conjy,
-       dim_t   n,
-       double* alpha,
-       double* beta,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       double* z, inc_t incz,
-       cntx_t* cntx
+       conj_t           conjx,
+       conj_t           conjy,
+       dim_t            n,
+       double* restrict alpha,
+       double* restrict beta,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       double* restrict z, inc_t incz,
+       cntx_t*          cntx
      )
 {
 	double*  restrict alpha_cast  = alpha;
diff --git a/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c b/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c
index 7c04b0efb..6d67e567a 100644
--- a/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c
@@ -45,15 +45,15 @@ typedef union
 
 void bli_daxpyf_int_var1
      (
-       conj_t  conja,
-       conj_t  conjx,
-       dim_t   m,
-       dim_t   b_n,
-       double* alpha,
-       double* a, inc_t inca, inc_t lda,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       cntx_t* cntx
+       conj_t           conja,
+       conj_t           conjx,
+       dim_t            m,
+       dim_t            b_n,
+       double* restrict alpha,
+       double* restrict a, inc_t inca, inc_t lda,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       cntx_t*          cntx
      )
 {
 	double*  restrict alpha_cast = alpha;
diff --git a/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c b/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c
index b42edef0b..a84d12c2d 100644
--- a/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c
@@ -45,16 +45,16 @@ typedef union
 
 void bli_ddotaxpyv_int_var1
      (
-       conj_t  conjxt,
-       conj_t  conjx,
-       conj_t  conjy,
-       dim_t   n,
-       double* alpha,
-       double* x, inc_t incx,
-       double* y, inc_t incy,
-       double* rho,
-       double* z, inc_t incz,
-       cntx_t* cntx
+       conj_t           conjxt,
+       conj_t           conjx,
+       conj_t           conjy,
+       dim_t            n,
+       double* restrict alpha,
+       double* restrict x, inc_t incx,
+       double* restrict y, inc_t incy,
+       double* restrict rho,
+       double* restrict z, inc_t incz,
+       cntx_t*          cntx
      )
 {
 	double*  restrict alpha_cast = alpha;
diff --git a/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c b/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c
index fc073b49b..69c638e62 100644
--- a/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c
@@ -45,20 +45,20 @@ typedef union
 
 void bli_ddotxaxpyf_int_var1
      (
-       conj_t  conjat,
-       conj_t  conja,
-       conj_t  conjw,
-       conj_t  conjx,
-       dim_t   m,
-       dim_t   b_n,
-       double* alpha,
-       double* a, inc_t inca, inc_t lda,
-       double* w, inc_t incw,
-       double* x, inc_t incx,
-       double* beta,
-       double* y, inc_t incy,
-       double* z, inc_t incz,
-       cntx_t* cntx
+       conj_t           conjat,
+       conj_t           conja,
+       conj_t           conjw,
+       conj_t           conjx,
+       dim_t            m,
+       dim_t            b_n,
+       double* restrict alpha,
+       double* restrict a, inc_t inca, inc_t lda,
+       double* restrict w, inc_t incw,
+       double* restrict x, inc_t incx,
+       double* restrict beta,
+       double* restrict y, inc_t incy,
+       double* restrict z, inc_t incz,
+       cntx_t*          cntx
      )
 { 
 	double*  restrict alpha_cast = alpha; 
diff --git a/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c b/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c
index af7f0ecbb..386863513 100644
--- a/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c
@@ -45,16 +45,16 @@ typedef union
 
 void bli_ddotxf_int_var1
      (
-       conj_t  conjat,
-       conj_t  conjx,
-       dim_t   m,
-       dim_t   b_n,
-       double* alpha,
-       double* a, inc_t inca, inc_t lda,
-       double* x, inc_t incx,
-       double* beta,
-       double* y, inc_t incy,
-       cntx_t* cntx
+       conj_t           conjat,
+       conj_t           conjx,
+       dim_t            m,
+       dim_t            b_n,
+       double* restrict alpha,
+       double* restrict a, inc_t inca, inc_t lda,
+       double* restrict x, inc_t incx,
+       double* restrict beta,
+       double* restrict y, inc_t incy,
+       cntx_t*          cntx
      )
 { 
 	double*  restrict alpha_cast = alpha;