diff --git a/basis-splines.lisp b/basis-splines.lisp
index b5f3b8bad596464742c0762a58d34ca610a96121..7b9aefb63f6edb5e67503f1e945e1ea0806d91a9 100644
--- a/basis-splines.lisp
+++ b/basis-splines.lisp
@@ -1,6 +1,6 @@
 ;; Basis splines.
 ;; Liam Healy 2008-02-18 14:43:20EST basis-splines.lisp
-;; Time-stamp: <2011-05-26 12:37:29EDT basis-splines.lisp>
+;; Time-stamp: <2012-01-13 12:01:11EST basis-splines.lisp>
 ;;
 ;; Copyright 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
 ;;; Should be subclass of interpolation?
 
 (defmobject basis-spline "gsl_bspline"
-  ((order sizet) (number-of-breakpoints sizet))
+  ((order :sizet) (number-of-breakpoints :sizet))
   "basis spline"
   :gsl-version (1 9)
   :documentation			; FDL
@@ -79,26 +79,26 @@
 (defmfun number-of-coefficients (bspline)
   "gsl_bspline_ncoeffs"
   (((mpointer bspline) :pointer))
-  :c-return sizet
+  :c-return :sizet
   :gsl-version (1 9))
 
 (defmfun order ((bspline basis-spline))
   "gsl_bspline_order"
   (((mpointer bspline) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :gsl-version (1 9))
 
 (defmfun number-of-breakpoints (bspline)
   "gsl_bspline_nbreak"
   (((mpointer bspline) :pointer))
-  :c-return sizet
+  :c-return :sizet
   :gsl-version (1 9)
   :documentation "The number of breakpoints of the basis spline bspline.")
 
 (defmfun breakpoint (i bspline)
   "gsl_bspline_breakpoint"
-  ((i sizet) ((mpointer bspline) :pointer))
+  ((i :sizet) ((mpointer bspline) :pointer))
   :c-return :double
   :gsl-version (1 9)
   :documentation "The ith breakpoint of the basis spline bspline.")
diff --git a/calculus/monte-carlo-structs.lisp b/calculus/monte-carlo-structs.lisp
index 7f8cb220c6ea69313323b10a0e807e5162fc52a3..08040854b6ed54a3448ec846fff98f6e1b1fb94b 100644
--- a/calculus/monte-carlo-structs.lisp
+++ b/calculus/monte-carlo-structs.lisp
@@ -1,6 +1,6 @@
 ;; CFFI-Grovel definitions for unix systems.
 ;; Liam Healy 2009-06-06 09:32:30EDT monte-carlo-structs.lisp
-;; Time-stamp: <2010-05-23 11:36:42EDT monte-carlo-structs.lisp>
+;; Time-stamp: <2012-01-13 12:01:40EST monte-carlo-structs.lisp>
 ;;
 ;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,18 +31,18 @@
 (include "gsl/gsl_monte_plain.h")
 
 (cstruct plain-state "gsl_monte_plain_state"
-  (dim "dim" :type sizet)
+  (dim "dim" :type :sizet)
   (x "x" :type :pointer))
 
 (include "gsl/gsl_monte_miser.h")
 
 (cstruct miser-state "gsl_monte_miser_state"
-  (min-calls "min_calls" :type sizet)
-  (min-calls-per-bisection "min_calls_per_bisection" :type sizet)
+  (min-calls "min_calls" :type :sizet)
+  (min-calls-per-bisection "min_calls_per_bisection" :type :sizet)
   (dither "dither" :type :double)
   (estimate-frac "estimate_frac" :type :double)
   (alpha "alpha" :type :double)
-  (dim "dim" :type sizet)
+  (dim "dim" :type :sizet)
   (estimate-style "estimate_style" :type :int)
   (depth "depth" :type :int)
   (verbose "verbose" :type :int)
@@ -65,8 +65,8 @@
 
 (cstruct vegas-state "gsl_monte_vegas_state"
   ;; grid 
-  (dim "dim" :type sizet)
-  (bins-max "bins_max" :type sizet)
+  (dim "dim" :type :sizet)
+  (bins-max "bins_max" :type :sizet)
   (bins "bins" :type :uint)		       ; uint
   (boxes "boxes" :type :uint)		       ; these are both counted along the axes
   (xi "xi" :type :pointer)
diff --git a/calculus/monte-carlo.lisp b/calculus/monte-carlo.lisp
index 25b9557092d8a487463dafc3e5bc35ef26cc7f6e..817354604ef0261060b51efff04d9e67f91546ec 100644
--- a/calculus/monte-carlo.lisp
+++ b/calculus/monte-carlo.lisp
@@ -1,6 +1,6 @@
 ;; Monte Carlo Integration
 ;; Liam Healy Sat Feb  3 2007 - 17:42
-;; Time-stamp: <2011-10-30 10:01:57EDT monte-carlo.lisp>
+;; Time-stamp: <2012-01-13 12:01:39EST monte-carlo.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 
 (defmobject monte-carlo-plain
     "gsl_monte_plain"
-  ((dim sizet))
+  ((dim :sizet))
   "plain Monte Carlo integration"
   :documentation			; FDL
   "Make and initialize a workspace for Monte Carlo integration in dimension dim."
@@ -52,7 +52,7 @@
   "gsl_monte_plain_integrate"
   ((callback :pointer)
    ((grid:foreign-pointer lower-limits) :pointer) ((grid:foreign-pointer upper-limits) :pointer)
-   ((dim0 lower-limits) sizet) (number-of-samples sizet)
+   ((dim0 lower-limits) :sizet) (number-of-samples :sizet)
    ((mpointer generator) :pointer)
    ((mpointer state) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
@@ -83,7 +83,7 @@
 
 (defmobject monte-carlo-miser
     "gsl_monte_miser"
-  ((dim sizet))
+  ((dim :sizet))
   "miser Monte Carlo integration"
   :documentation			; FDL
   "Make and initialize a workspace for Monte Carlo integration in
@@ -113,7 +113,7 @@
   "gsl_monte_miser_integrate"
   ((callback :pointer)
    ((grid:foreign-pointer lower-limits) :pointer) ((grid:foreign-pointer upper-limits) :pointer)
-   ((dim0 lower-limits) sizet) (number-of-samples sizet)
+   ((dim0 lower-limits) :sizet) (number-of-samples :sizet)
    ((mpointer generator) :pointer)
    ((mpointer state) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
@@ -144,7 +144,7 @@
 
 (defmobject monte-carlo-vegas
     "gsl_monte_vegas"
-  ((dim sizet))
+  ((dim :sizet))
   "vegas Monte Carlo integration"
   :documentation			; FDL
   "Make and initialize a workspace for Monte Carlo integration in
@@ -174,7 +174,7 @@
   "gsl_monte_vegas_integrate"
   ((callback :pointer)
    ((grid:foreign-pointer lower-limits) :pointer) ((grid:foreign-pointer upper-limits) :pointer)
-   ((dim0 lower-limits) sizet) (number-of-samples sizet)
+   ((dim0 lower-limits) :sizet) (number-of-samples :sizet)
    ((mpointer generator) :pointer)
    ((mpointer state) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
diff --git a/calculus/numerical-integration-with-tables.lisp b/calculus/numerical-integration-with-tables.lisp
index 746de276a4cd64f8d1b9c250e5cfce77c731d691..a6d63775cf59c57cb9f73650de077b23f822be59 100644
--- a/calculus/numerical-integration-with-tables.lisp
+++ b/calculus/numerical-integration-with-tables.lisp
@@ -1,6 +1,6 @@
 ;; Numerical integration techniques that require tables
 ;; Liam Healy 2009-04-04 15:24:05EDT 
-;; Time-stamp: <2011-10-30 10:27:27EDT numerical-integration-with-tables.lisp>
+;; Time-stamp: <2012-01-13 12:01:39EST numerical-integration-with-tables.lisp>
 ;;
 ;; Copyright 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -62,7 +62,7 @@
    (a :double) (b :double)
    ((mpointer table) :pointer)
    (absolute-error :double) (relative-error :double)
-   (limit sizet) ((mpointer workspace) :pointer)
+   (limit :sizet) ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
   (callback (:struct fnstruct) nil (function :double (:input :double) :slug))
@@ -86,7 +86,7 @@
 
 (defmobject qawo-table
     "gsl_integration_qawo_table"
-  ((omega :double) (L :double) (trig integrate-sine-cosine) (n sizet))
+  ((omega :double) (L :double) (trig integrate-sine-cosine) (n :sizet))
   "table for QAWO numerical integration method"
   :documentation			; FDL
   "Make a table describing a sine or cosine weight function W(x) with
@@ -119,7 +119,7 @@
   ((callback :pointer)
    (a :double)
    (absolute-error :double) (relative-error :double)
-   (limit sizet) ((mpointer workspace) :pointer)
+   (limit :sizet) ((mpointer workspace) :pointer)
    ((mpointer table) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
@@ -162,7 +162,7 @@
   ((callback :pointer)
    (a :double)
    (absolute-error :double)
-   (limit sizet)
+   (limit :sizet)
    ((mpointer workspace) :pointer) ((mpointer cycle-workspace) :pointer)
    ((mpointer table) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
diff --git a/calculus/numerical-integration.lisp b/calculus/numerical-integration.lisp
index 606f7d93d7859f91166ffe9cf111e8033250ab95..f4c79d9288f2c07868ba30291741b33e1411a5bc 100644
--- a/calculus/numerical-integration.lisp
+++ b/calculus/numerical-integration.lisp
@@ -1,6 +1,6 @@
 ;; Numerical integration
 ;; Liam Healy, Wed Jul  5 2006 - 23:14
-;; Time-stamp: <2011-10-30 10:01:11EDT numerical-integration.lisp>
+;; Time-stamp: <2012-01-13 12:01:38EST numerical-integration.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -50,7 +50,7 @@
    (a :double) (b :double)
    (absolute-error :double) (relative-error :double)
    (result (:pointer :double)) (abserr (:pointer :double))
-   (neval (:pointer sizet)))
+   (neval (:pointer :sizet)))
   :callbacks
   (callback (:struct fnstruct) nil (function :double (:input :double) :slug))
   :callback-dynamic (nil (function))
@@ -70,7 +70,7 @@
 ;;;;****************************************************************************
 
 (defmobject integration-workspace
-    "gsl_integration_workspace" ((size sizet))
+    "gsl_integration_workspace" ((size :sizet))
     "integration workspace"
     :documentation			; FDL
     "Make a workspace sufficient to hold n double
@@ -89,7 +89,7 @@
   ((callback :pointer)
    (a :double) (b :double)
    (absolute-error :double) (relative-error :double)
-   (limit sizet) (method integrate-method) ((mpointer workspace) :pointer)
+   (limit :sizet) (method integrate-method) ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
   (callback (:struct fnstruct) nil (function :double (:input :double) :slug))
@@ -125,7 +125,7 @@
   "gsl_integration_qags"
   ((callback :pointer)
    (a :double) (b :double)
-   (absolute-error :double) (relative-error :double) (limit sizet)
+   (absolute-error :double) (relative-error :double) (limit :sizet)
    ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
@@ -157,8 +157,8 @@
 	      (limit 1000) (workspace (make-integration-workspace limit)))
   "gsl_integration_qagp"
   ((callback :pointer)
-   ((grid:foreign-pointer points) :pointer) ((dim0 points) sizet)
-   (absolute-error :double) (relative-error :double) (limit sizet)
+   ((grid:foreign-pointer points) :pointer) ((dim0 points) :sizet)
+   (absolute-error :double) (relative-error :double) (limit :sizet)
    ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :inputs (points)
@@ -189,7 +189,7 @@
      (limit 1000) (workspace (make-integration-workspace limit)))
   "gsl_integration_qagi"
   ((callback :pointer)
-   (absolute-error :double) (relative-error :double) (limit sizet)
+   (absolute-error :double) (relative-error :double) (limit :sizet)
    ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
@@ -214,7 +214,7 @@
 	      (limit 1000) (workspace (make-integration-workspace limit)))
   "gsl_integration_qagiu"
   ((callback :pointer) (a :double)
-   (absolute-error :double) (relative-error :double) (limit sizet)
+   (absolute-error :double) (relative-error :double) (limit :sizet)
    ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
@@ -235,7 +235,7 @@
 	      (limit 1000) (workspace (make-integration-workspace limit)))
   "gsl_integration_qagil"
   ((callback :pointer) (b :double)
-   (absolute-error :double) (relative-error :double) (limit sizet)
+   (absolute-error :double) (relative-error :double) (limit :sizet)
    ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
@@ -261,7 +261,7 @@
   "gsl_integration_qawc"
   ((callback :pointer)
    (a :double) (b :double) (c :double)
-   (absolute-error :double) (relative-error :double) (limit sizet)
+   (absolute-error :double) (relative-error :double) (limit :sizet)
    ((mpointer workspace) :pointer)
    (result (:pointer :double)) (abserr (:pointer :double)))
   :callbacks
diff --git a/chebyshev.lisp b/chebyshev.lisp
index 6eeab490148a3cc22682860ff9487f2bc5a06dc9..4db6213622308a3c90cc91dbfb040d63bcf99029 100644
--- a/chebyshev.lisp
+++ b/chebyshev.lisp
@@ -1,6 +1,6 @@
 ;; Chebyshev Approximations
 ;; Liam Healy Sat Nov 17 2007 - 20:36
-;; Time-stamp: <2011-10-30 10:25:39EDT chebyshev.lisp>
+;; Time-stamp: <2012-01-13 12:01:09EST chebyshev.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
 ;;;;****************************************************************************
 
 (defmobject chebyshev "gsl_cheb"
-  ((order sizet))
+  ((order :sizet))
   "Chebyshev series"
   :documentation			; FDL
   "Make a Chebyshev series of specified order."
@@ -43,7 +43,7 @@
   (((mpointer object) :pointer))
   :definition :method
   :documentation "The order of Chebyshev series."
-  :c-return sizet
+  :c-return :sizet
   :gsl-version (1 12))
 
 (defmfun size ((chebyshev chebyshev))
@@ -51,7 +51,7 @@
   (((mpointer chebyshev) :pointer))
   :definition :method
   :documentation "The length of the Chebyshev coefficient array."
-  :c-return sizet
+  :c-return :sizet
   :gsl-version (1 12))
 
 (defmfun coefficients (chebyshev)
@@ -75,7 +75,7 @@
 (defmfun evaluate ((object chebyshev) x &key order)
   ("gsl_cheb_eval" "gsl_cheb_eval_n")
   ((((mpointer object) :pointer) (x :double))
-   (((mpointer object) :pointer) (order sizet) (x :double)))
+   (((mpointer object) :pointer) (order :sizet) (x :double)))
   :definition :method
   :callback-object object
   :c-return :double
@@ -87,7 +87,7 @@
   ("gsl_cheb_eval_err" "gsl_cheb_eval_n_err")
   ((((mpointer chebyshev) :pointer) (x :double)
     (result (:pointer :double)) (abserr (:pointer :double)))
-   (((mpointer chebyshev) :pointer) (order sizet) (x :double)
+   (((mpointer chebyshev) :pointer) (order :sizet) (x :double)
     (result (:pointer :double)) (abserr (:pointer :double))))
   :documentation			; FDL
   "Evaluate the Chebyshev series at a point x, returning result and
diff --git a/data/array-structs.lisp b/data/array-structs.lisp
index cf4c431aa85e6a4dd30b8c9a99905c5722ce099b..84055f64cf6beaa9adc4234fca21bf0ac6526154 100644
--- a/data/array-structs.lisp
+++ b/data/array-structs.lisp
@@ -1,6 +1,6 @@
 ;; CFFI-Grovel definitions for unix systems.
 ;; Liam Healy 2009-06-06 09:36:29EDT array-structs.lisp
-;; Time-stamp: <2010-07-18 22:52:48EDT array-structs.lisp>
+;; Time-stamp: <2012-01-13 12:01:37EST array-structs.lisp>
 ;;
 ;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,14 +31,14 @@
 (include "gsl/gsl_block_double.h")
 
 (cstruct gsl-block-c "gsl_block"
-  (size "size" :type sizet)
+  (size "size" :type :sizet)
   (data "data" :type :pointer))
 
 (include "gsl/gsl_vector_double.h")
 
 (cstruct gsl-vector-c "gsl_vector"
-  (size "size" :type sizet)
-  (stride "stride" :type sizet)
+  (size "size" :type :sizet)
+  (stride "stride" :type :sizet)
   (data "data" :type :pointer)
   (block "block" :type :pointer)
   (owner "owner" :type :int))
@@ -46,9 +46,9 @@
 (include "gsl/gsl_matrix_double.h")
 
 (cstruct gsl-matrix-c "gsl_matrix"
-  (size0 "size1" :type sizet)
-  (size1 "size2" :type sizet)
-  (tda "tda" :type sizet)
+  (size0 "size1" :type :sizet)
+  (size1 "size2" :type :sizet)
+  (tda "tda" :type :sizet)
   (data "data" :type :pointer)
   (block "block" :type :pointer)
   (owner "owner" :type :int))
@@ -56,12 +56,12 @@
 (include "gsl/gsl_permutation.h")
 
 (cstruct gsl-permutation-c "gsl_permutation"
-  (size "size" :type sizet)
+  (size "size" :type :sizet)
   (data "data" :type :pointer))
 
 (include "gsl/gsl_combination.h")
 
 (cstruct gsl-combination-c "gsl_combination"
-  (range "n" :type sizet)
-  (size "k" :type sizet)
+  (range "n" :type :sizet)
+  (size "k" :type :sizet)
   (data "data" :type :pointer))
diff --git a/data/both.lisp b/data/both.lisp
index 10ad027e3c433e3125c5b5351d4947e56b14a882..c2bbe4702c47f74fda7734aefb154c1df7a41925 100644
--- a/data/both.lisp
+++ b/data/both.lisp
@@ -1,6 +1,6 @@
 ;; Functions for both vectors and matrices.
 ;; Liam Healy 2008-04-26 20:48:44EDT both.lisp
-;; Time-stamp: <2011-05-26 12:37:36EDT both.lisp>
+;; Time-stamp: <2012-01-13 12:01:36EST both.lisp>
 ;;
 ;; Copyright 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -27,9 +27,9 @@
 (defmfun alloc-from-block ((object vector) blockptr)
   ("gsl_" :category :type "_alloc_from_block")
   ((blockptr :pointer)
-   (0 sizet)				; offset
-   ((size object) sizet)		; number of elements
-   (1 sizet))				; stride
+   (0 :sizet)				; offset
+   ((size object) :sizet)		; number of elements
+   (1 :sizet))				; stride
   :definition :generic
   :c-return :pointer
   :export nil
@@ -38,10 +38,10 @@
 (defmfun alloc-from-block ((object grid:matrix) blockptr)
   ("gsl_" :category :type "_alloc_from_block")
   ((blockptr :pointer)
-   (0 sizet)				; offset
-   ((first (grid:dimensions object)) sizet)	; number of rows
-   ((second (grid:dimensions object)) sizet)	; number of columns
-   ((second (grid:dimensions object)) sizet))	; "tda" = number of columns for now
+   (0 :sizet)				; offset
+   ((first (grid:dimensions object)) :sizet)	; number of rows
+   ((second (grid:dimensions object)) :sizet)	; number of columns
+   ((second (grid:dimensions object)) :sizet))	; "tda" = number of columns for now
   :definition :methods
   :c-return :pointer
   :export nil)
@@ -100,9 +100,9 @@
   "Create a form to access the GSL array value from the mpointer.  If value is not nil,
    set the value; otherwise, get the value."
   ;; (access-value-int 'ptr 'grid:vector-unsigned-byte-16 45 '(3))
-  ;; (FOREIGN-FUNCALL "gsl_vector_ushort_set" :POINTER PTR SIZET 3 :UNSIGNED-SHORT 45 :VOID)
+  ;; (FOREIGN-FUNCALL "gsl_vector_ushort_set" :POINTER PTR :SIZET 3 :UNSIGNED-SHORT 45 :VOID)
   ;; (access-value-int 'ptr 'grid:matrix-unsigned-byte-16 nil '(45 3))
-  ;; (FOREIGN-FUNCALL "gsl_matrix_ushort_get" :POINTER PTR SIZET 45 SIZET 3 :UNSIGNED-SHORT)
+  ;; (FOREIGN-FUNCALL "gsl_matrix_ushort_get" :POINTER PTR :SIZET 45 :SIZET 3 :UNSIGNED-SHORT)
   (let ((element-type (grid::farray-element-type class-name))
 	(matrixp (subtypep class-name 'grid:matrix)))
     (unless (or (and matrixp (eql 2 (length indices)))
@@ -116,8 +116,8 @@
 	(if matrixp 'grid:matrix 'vector)
 	element-type)
       :pointer ,mpointer
-      sizet ,(first indices)
-      ,@(when matrixp (list 'sizet (second indices)))
+      :sizet ,(first indices)
+      ,@(when matrixp (list ':sizet (second indices)))
       ,(grid:cl-cffi element-type)
       ,@(when value `(,value :void)))))
 
@@ -324,14 +324,14 @@
   :definition :generic
   :element-types :no-complex
   :inputs (a)
-  :c-return sizet
+  :c-return :sizet
   :documentation			; FDL
   "The index of the minimum value in a.  When there are several
   equal minimum elements, then the lowest index is returned.")
 
 (defmfun min-index ((a grid:matrix))
   ("gsl_" :category :type "_min_index")
-  (((mpointer a) :pointer) (imin (:pointer sizet)) (jmin (:pointer sizet)))
+  (((mpointer a) :pointer) (imin (:pointer :sizet)) (jmin (:pointer :sizet)))
   :definition :methods
   :element-types :no-complex
   :inputs (a)
@@ -343,14 +343,14 @@
   :definition :generic
   :element-types :no-complex
   :inputs (a)
-  :c-return sizet
+  :c-return :sizet
   :documentation			; FDL
   "The index of the maximum value in a.  When there are several
   equal maximum elements, then the lowest index is returned.")
 
 (defmfun max-index ((a grid:matrix))
   ("gsl_" :category :type "_max_index")
-  (((mpointer a) :pointer) (imin (:pointer sizet)) (jmin (:pointer sizet)))
+  (((mpointer a) :pointer) (imin (:pointer :sizet)) (jmin (:pointer :sizet)))
   :definition :methods
   :element-types :no-complex
   :inputs (a)
@@ -358,7 +358,7 @@
 
 (defmfun minmax-index ((a vector))
   ("gsl_" :category :type "_minmax_index")
-  (((mpointer a) :pointer) (imin (:pointer sizet)) (jmin (:pointer sizet)))
+  (((mpointer a) :pointer) (imin (:pointer :sizet)) (jmin (:pointer :sizet)))
   :definition :generic
   :element-types :no-complex
   :inputs (a)
@@ -372,8 +372,8 @@
 (defmfun minmax-index ((a grid:matrix))
   ("gsl_" :category :type "_minmax_index")
   (((mpointer a) :pointer)
-   (imin (:pointer sizet)) (jmin (:pointer sizet))
-   (imax (:pointer sizet)) (jmax (:pointer sizet)))
+   (imin (:pointer :sizet)) (jmin (:pointer :sizet))
+   (imax (:pointer :sizet)) (jmax (:pointer :sizet)))
   :definition :methods
   :element-types :no-complex
   :inputs (a)
diff --git a/data/combination.lisp b/data/combination.lisp
index 06d2538c66e16a883a34cfb7021484b5afeefb49..0215cafbfd0f4550ecaa1123a7f46492a8c94930 100644
--- a/data/combination.lisp
+++ b/data/combination.lisp
@@ -1,6 +1,6 @@
 ;; Combinations
 ;; Liam Healy, Sun Mar 26 2006 - 11:51
-;; Time-stamp: <2011-01-10 18:16:28EST combination.lisp>
+;; Time-stamp: <2012-01-13 12:01:36EST combination.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -123,7 +123,7 @@
 (defmfun combination-range (c)
   "gsl_combination_n"
   (((mpointer c) :pointer))
-  :c-return sizet
+  :c-return :sizet
   :inputs (c)
   :documentation			; FDL
   "The range (n), or maximum possible value (n in the (n k) notation)
@@ -133,7 +133,7 @@
   "gsl_combination_k"
   (((mpointer c) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :documentation			; FDL
   "The number of elements (k) in the combination c.")
 
diff --git a/data/matrix.lisp b/data/matrix.lisp
index 22df33a2171efefae0a62f92421c7a6dda3fa4d3..74225b9c9b5f131b248f51ddf4a5fb7f1e7e7c4d 100644
--- a/data/matrix.lisp
+++ b/data/matrix.lisp
@@ -1,6 +1,6 @@
 ;; Matrices
 ;; Liam Healy 2008-04-15 21:57:52EDT matrix.lisp
-;; Time-stamp: <2011-01-12 00:34:45EST matrix.lisp>
+;; Time-stamp: <2012-01-13 12:01:35EST matrix.lisp>
 ;;
 ;; Copyright 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -46,7 +46,7 @@
 (defmfun row ((matrix grid:matrix) i
      &optional (vector (grid:make-foreign-array element-type :dimensions (dim1 matrix))))
   ("gsl_matrix" :type "_get_row")
-  (((mpointer vector) :pointer) ((mpointer matrix) :pointer) (i sizet))
+  (((mpointer vector) :pointer) ((mpointer matrix) :pointer) (i :sizet))
   :definition :generic
   :inputs (matrix)
   :outputs (vector)
@@ -58,7 +58,7 @@
 
 (defmfun (setf row) ((vector vector) (matrix grid:matrix) i)
   ("gsl_matrix" :type "_set_row")
-  (((mpointer matrix) :pointer) (i sizet) ((mpointer vector) :pointer))
+  (((mpointer matrix) :pointer) (i :sizet) ((mpointer vector) :pointer))
   :definition :generic
   :inputs (vector matrix)
   :outputs (matrix)
@@ -70,7 +70,7 @@
 (defmfun column ((matrix grid:matrix) i
      &optional (vector (grid:make-foreign-array element-type :dimensions (dim0 matrix))))
   ("gsl_matrix" :type "_get_col")
-  (((mpointer vector) :pointer) ((mpointer matrix) :pointer) (i sizet))
+  (((mpointer vector) :pointer) ((mpointer matrix) :pointer) (i :sizet))
   :definition :generic
   :inputs (matrix)
   :outputs (vector)
@@ -82,7 +82,7 @@
 
 (defmfun (setf column) ((vector vector) (matrix grid:matrix) i)
   ("gsl_matrix" :type "_set_col")
-  (((mpointer matrix) :pointer) (i sizet) ((mpointer vector) :pointer))
+  (((mpointer matrix) :pointer) (i :sizet) ((mpointer vector) :pointer))
   :definition :generic
   :inputs (vector matrix)
   :outputs (matrix)
@@ -97,7 +97,7 @@
 
 (defmfun swap-rows ((matrix grid:matrix) i j)
   ("gsl_matrix" :type "_swap_rows")
-  (((mpointer matrix) :pointer) (i sizet) (j sizet))
+  (((mpointer matrix) :pointer) (i :sizet) (j :sizet))
   :definition :generic
   :return (matrix)
   :inputs (matrix)
@@ -107,7 +107,7 @@
 
 (defmfun swap-columns ((matrix grid:matrix) i j)
   ("gsl_matrix" :type "_swap_columns")
-  (((mpointer matrix) :pointer) (i sizet) (j sizet))
+  (((mpointer matrix) :pointer) (i :sizet) (j :sizet))
   :definition :generic
   :return (matrix)
   :inputs (matrix)
@@ -117,7 +117,7 @@
 
 (defmfun swap-row-column ((matrix grid:matrix) i j)
   ("gsl_matrix" :type "_swap_rowcol")
-  (((mpointer matrix) :pointer) (i sizet) (j sizet))
+  (((mpointer matrix) :pointer) (i :sizet) (j :sizet))
   :definition :generic
   :return (matrix)
   :inputs (matrix)
diff --git a/data/permutation.lisp b/data/permutation.lisp
index 89185942f8f95c71eaab88c13af977849fbe81ab..ad98ee723f0135fda97d71584a500064572e4f7e 100644
--- a/data/permutation.lisp
+++ b/data/permutation.lisp
@@ -1,6 +1,6 @@
 ;; Permutations
 ;; Liam Healy, Sun Mar 26 2006 - 11:51
-;; Time-stamp: <2011-05-26 12:37:36EDT permutation.lisp>
+;; Time-stamp: <2012-01-13 12:01:35EST permutation.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -101,7 +101,7 @@
 
 (defmfun swap-elements ((p permutation) i j)
   "gsl_permutation_swap"
-  (((mpointer p) :pointer) (i sizet) (j sizet))
+  (((mpointer p) :pointer) (i :sizet) (j :sizet))
   :definition :method
   :inputs (p)
   :outputs (p)
@@ -117,7 +117,7 @@
   "gsl_permutation_size"
   (((mpointer p) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :inputs (p)
   :documentation			; FDL
   "The size of the permutation p.")
@@ -220,7 +220,7 @@
 (defmfun permute
     (p (data #.grid:+foreign-pointer-class+) &optional (size 1) (stride 1))
   "gsl_permute"
-  (((mpointer p) :pointer) (data :pointer) (stride sizet) (size sizet))
+  (((mpointer p) :pointer) (data :pointer) (stride :sizet) (size :sizet))
   :definition :method
   :inputs (p data)
   :outputs (data)
@@ -248,7 +248,7 @@
 (defmfun permute-inverse
     (p (data #.grid:+foreign-pointer-class+) &optional (size 1) (stride 1))
   "gsl_permute_inverse"
-  (((mpointer p) :pointer) (data :pointer) (stride sizet) (stride sizet))
+  (((mpointer p) :pointer) (data :pointer) (stride :sizet) (stride :sizet))
   :definition :method
   :inputs (p data)
   :outputs (data)
@@ -294,7 +294,7 @@
 
 (defmfun inversions (p)
   "gsl_permutation_inversions" (((mpointer p) :pointer))
-  :c-return sizet
+  :c-return :sizet
   :inputs (p)
   :documentation			; FDL
   "Count the number of inversions in the permutation
@@ -305,7 +305,7 @@
 
 (defmfun linear-cycles (p)
   "gsl_permutation_linear_cycles" (((mpointer p) :pointer))
-  :c-return sizet
+  :c-return :sizet
   :inputs (p)
   :documentation			; FDL
   "Count the number of cycles in the permutation p, given in linear form.")
@@ -313,7 +313,7 @@
 (defmfun canonical-cycles (p)
   "gsl_permutation_canonical_cycles"
   (((mpointer p) :pointer))
-  :c-return sizet
+  :c-return :sizet
   :inputs (p)
   :documentation			; FDL
   "Count the number of cycles in the permutation q, given in canonical form.")
diff --git a/data/vector.lisp b/data/vector.lisp
index ac1a41a6a8be93a65423e567d2f62c31a1de6e89..b56d3972beff2b2cfcb95f399597bb923e119982 100644
--- a/data/vector.lisp
+++ b/data/vector.lisp
@@ -1,6 +1,6 @@
 ;; Vectors
 ;; Liam Healy 2008-04-13 09:39:02EDT vector.lisp
-;; Time-stamp: <2010-06-28 11:03:32EDT vector.lisp>
+;; Time-stamp: <2012-01-13 12:01:37EST vector.lisp>
 ;;
 ;; Copyright 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
 
 (defmfun set-basis ((object vector) index)
   ("gsl_" :category :type "_set_basis")
-  (((mpointer object) :pointer) (index sizet))
+  (((mpointer object) :pointer) (index :sizet))
   :definition :generic
   :inputs (object)
   :outputs (object)
@@ -39,7 +39,7 @@
 
 (defmfun swap-elements ((vec vector) i j)
   ("gsl_" :category :type "_swap_elements")
-  (((mpointer vec) :pointer) (i sizet) (j sizet))
+  (((mpointer vec) :pointer) (i :sizet) (j :sizet))
   :definition :generic
   :inputs (vec)
   :outputs (vec)
diff --git a/eigensystems/eigen-struct.lisp b/eigensystems/eigen-struct.lisp
index 44ab2811cf01d7ebb68404cd47677f4fdc44436c..1f6ea49fc2ad27e9f640aa35635ecc08f3a2e6ab 100644
--- a/eigensystems/eigen-struct.lisp
+++ b/eigensystems/eigen-struct.lisp
@@ -1,6 +1,6 @@
 ;; CFFI-Grovel definitions.
 ;; Liam Healy
-;; Time-stamp: <2010-05-23 11:36:31EDT eigen-struct.lisp>
+;; Time-stamp: <2012-01-13 12:01:34EST eigen-struct.lisp>
 ;;
 ;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,4 +31,4 @@
 (include "gsl/gsl_eigen.h")
 
 (cstruct gsl-nonsymm-ws "gsl_eigen_nonsymm_workspace"
-  (n-evals "n_evals" :type sizet))	     ; number of eigenvalues found
+  (n-evals "n_evals" :type :sizet))	     ; number of eigenvalues found
diff --git a/eigensystems/generalized.lisp b/eigensystems/generalized.lisp
index 466d48fc334291772a96fcaad63b5c128c117533..0d06f763f7090d34f46d1299367709842ffe3c7f 100644
--- a/eigensystems/generalized.lisp
+++ b/eigensystems/generalized.lisp
@@ -1,6 +1,6 @@
 ;; Real generalized eigensystems
 ;; Liam Healy 2009-02-16 12:55:04EST real-generalized.lisp
-;; Time-stamp: <2011-01-12 00:08:22EST generalized.lisp>
+;; Time-stamp: <2012-01-13 12:01:34EST generalized.lisp>
 ;;
 ;; Copyright 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 (in-package :gsl)
 
 (defmobject eigen-gensymm
-    "gsl_eigen_gensymm" ((n sizet))
+    "gsl_eigen_gensymm" ((n :sizet))
     "symmetric generalized eigenvalue workspace"
     :gsl-version (1 10)
     :documentation			; FDL
@@ -30,7 +30,7 @@
      is O(2n).")
 
 (defmobject eigen-gensymmv
-    "gsl_eigen_gensymmv" ((n sizet))
+    "gsl_eigen_gensymmv" ((n :sizet))
     "symmetric generalized eigensystem workspace"
     :gsl-version (1 10)
     :documentation			; FDL
@@ -39,7 +39,7 @@
     of the workspace is O(4n).")
 
 (defmobject eigen-genherm
-    "gsl_eigen_genherm" ((n sizet))
+    "gsl_eigen_genherm" ((n :sizet))
     "hermitian generalized eigenvalue workspace"
     :gsl-version (1 10)
     :documentation			; FDL
@@ -48,7 +48,7 @@
     workspace is O(3n).")
 
 (defmobject eigen-genhermv
-    "gsl_eigen_genhermv" ((n sizet))
+    "gsl_eigen_genhermv" ((n :sizet))
     "hermitian generalized eigensystem workspace"
     :gsl-version (1 10)
     :documentation			; FDL
diff --git a/eigensystems/nonsymmetric-generalized.lisp b/eigensystems/nonsymmetric-generalized.lisp
index 3ee35f8242323c13e85a23c1d84838f354d02ae9..f81370464889555bead7e1a3082c04bab0e9fc4d 100644
--- a/eigensystems/nonsymmetric-generalized.lisp
+++ b/eigensystems/nonsymmetric-generalized.lisp
@@ -1,6 +1,6 @@
 ;; Generalized eigensystems for nonsymmetric real matrices
 ;; Liam Healy 2009-02-16 14:27:20EST nonsymmetric-generalized.lisp
-;; Time-stamp: <2011-01-10 18:19:14EST nonsymmetric-generalized.lisp>
+;; Time-stamp: <2012-01-13 12:01:33EST nonsymmetric-generalized.lisp>
 ;;
 ;; Copyright 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 (in-package :gsl)
 
 (defmobject eigen-gen
-    "gsl_eigen_gen" ((n sizet))
+    "gsl_eigen_gen" ((n :sizet))
     "generalized nonsymmetric eigenvalue workspace"
     :gsl-version (1 10)
     :documentation			; FDL
@@ -30,7 +30,7 @@
     is O(n).")
 
 (defmobject eigen-genv
-    "gsl_eigen_genv" ((n sizet))
+    "gsl_eigen_genv" ((n :sizet))
     "generalized nonsymmetric eigenvector and eigenvalue workspace"
     :gsl-version (1 10)
     :documentation			; FDL
diff --git a/eigensystems/nonsymmetric.lisp b/eigensystems/nonsymmetric.lisp
index 9514709a1abc290dda6565d2989761f3b080095e..1c229c79a671ad9e70435c9bc915a1c422ebc552 100644
--- a/eigensystems/nonsymmetric.lisp
+++ b/eigensystems/nonsymmetric.lisp
@@ -1,6 +1,6 @@
 ;; Eigensystems for nonsymmetric real matrices
 ;; Liam Healy 2009-02-16 12:51:18EST nonsymmetric.lisp
-;; Time-stamp: <2011-01-10 18:19:13EST nonsymmetric.lisp>
+;; Time-stamp: <2012-01-13 12:01:33EST nonsymmetric.lisp>
 ;;
 ;; Copyright 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 (in-package :gsl)
 
 (defmobject eigen-nonsymm
-    "gsl_eigen_nonsymm" ((n sizet))
+    "gsl_eigen_nonsymm" ((n :sizet))
     "non-symmetric eigenvalue workspace"
     :gsl-version (1 9)
     :documentation			; FDL
@@ -30,7 +30,7 @@
   is O(2n).")
 
 (defmobject eigen-nonsymmv
-    "gsl_eigen_nonsymmv" ((n sizet))
+    "gsl_eigen_nonsymmv" ((n :sizet))
     "non-symmetric eigenvector and eigenvalue workspace"
     :gsl-version (1 9)
     :documentation			; FDL
diff --git a/eigensystems/symmetric-hermitian.lisp b/eigensystems/symmetric-hermitian.lisp
index eca25afc1aa80bbc34e76e749156b8ddc53d6979..ea03af25f563764751900a7f5ce09302f9028b57 100644
--- a/eigensystems/symmetric-hermitian.lisp
+++ b/eigensystems/symmetric-hermitian.lisp
@@ -1,6 +1,6 @@
 ;; Eigenvectors and eigenvalues
 ;; Liam Healy, Sun May 21 2006 - 19:52
-;; Time-stamp: <2011-08-17 00:18:16EDT symmetric-hermitian.lisp>
+;; Time-stamp: <2012-01-13 12:01:32EST symmetric-hermitian.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 ;;;;****************************************************************************
 
 (defmobject eigen-symm
-    "gsl_eigen_symm" ((n sizet))
+    "gsl_eigen_symm" ((n :sizet))
     "symmetric eigenvalue workspace"
     :documentation			; FDL
     "Make a workspace for computing eigenvalues of
@@ -39,7 +39,7 @@
   is O(2n).")
 
 (defmobject eigen-symmv
-    "gsl_eigen_symmv" ((n sizet))
+    "gsl_eigen_symmv" ((n :sizet))
     "symmetric eigensystem workspace"
     :documentation			; FDL
     "Make a workspace for computing eigenvalues and
@@ -47,7 +47,7 @@
   the workspace is O(4n).")
 
 (defmobject eigen-herm
-    "gsl_eigen_herm" ((n sizet))
+    "gsl_eigen_herm" ((n :sizet))
     "Hermitian eigenvalue workspace"	; FDL
     :documentation			; FDL
     "Make a workspace for computing eigenvalues of
@@ -55,7 +55,7 @@
   is O(3n).")
 
 (defmobject eigen-hermv
-    "gsl_eigen_hermv" ((n sizet))
+    "gsl_eigen_hermv" ((n :sizet))
     "Hermitian eigensystem workspace"
     :documentation			; FDL
     "Make a workspace for computing eigenvalues and
diff --git a/fast-fourier-transforms/backward.lisp b/fast-fourier-transforms/backward.lisp
index a5bf3c7b4ff37353fe783d20a76e915c920535a8..9026e1ad5e0d6fa39b4e50749ada3065e4ad404e 100644
--- a/fast-fourier-transforms/backward.lisp
+++ b/fast-fourier-transforms/backward.lisp
@@ -1,6 +1,6 @@
 ;; Backward FFT
 ;; Sumant Oemrawsingh, Sat Oct 24 2009 - 12:55
-;; Time-stamp: <2011-01-11 23:34:19EST backward.lisp>
+;; Time-stamp: <2012-01-13 12:01:32EST backward.lisp>
 ;;
 ;; Copyright 2009, 2011 Sumant Oemrawsingh, Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
 (defmfun backward-fourier-transform-radix2
   ((vector vector) &key (stride 1))
   ("gsl_fft" :type "_radix2_backward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :complex
   :inputs (vector)
@@ -49,7 +49,7 @@
      (wavetable (make-fft-wavetable element-type (floor (size vector) stride)))
      (workspace (make-fft-workspace element-type (floor (size vector) stride))))
   ("gsl_fft" :type "_backward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((mpointer wavetable) :pointer) ((mpointer workspace) :pointer))
   :definition :generic
   :element-types :complex
@@ -69,7 +69,7 @@
 (defmfun backward-fourier-transform-halfcomplex-radix2
     ((vector vector) &key (stride 1))
   ("gsl_fft_halfcomplex" :type "_radix2_backward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float
   :inputs (vector)
@@ -86,7 +86,7 @@
      (wavetable (make-fft-wavetable element-type (floor (size vector) stride) t))
      (workspace (make-fft-workspace element-type (floor (size vector) stride))))
   ("gsl_fft_halfcomplex" :type "_backward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((mpointer wavetable) :pointer) ((mpointer workspace) :pointer))
   :definition :generic
   :element-types :float
@@ -106,7 +106,7 @@
 (defmfun backward-fourier-transform-dif-radix2
   ((vector vector) &key (stride 1))
   ("gsl_fft" :type "_radix2_dif_backward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :complex
   :inputs (vector)
diff --git a/fast-fourier-transforms/discrete.lisp b/fast-fourier-transforms/discrete.lisp
index ac7b7ae4e8ea5e07acdd6b5c6ffcea209bbd323e..05deee353ea2d00fececaaf249d47b48b0664c3d 100644
--- a/fast-fourier-transforms/discrete.lisp
+++ b/fast-fourier-transforms/discrete.lisp
@@ -1,6 +1,6 @@
 ;; Discrete Fourier Transforms
 ;; Liam Healy 2009-11-07 14:24:07EST
-;; Time-stamp: <2011-01-10 18:16:24EST discrete.lisp>
+;; Time-stamp: <2012-01-13 12:01:31EST discrete.lisp>
 ;;
 ;; Copyright 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
      &key (stride 1)
      (result (grid:make-foreign-array element-type :dimensions (grid:dimensions vector))))
   ("gsl_dft" :type "_forward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((grid:foreign-pointer result) :pointer))
   :definition :generic
   :element-types :complex
@@ -47,7 +47,7 @@
      &key (stride 1)
      (result (grid:make-foreign-array element-type :dimensions (grid:dimensions vector))))
   ("gsl_dft" :type "_backward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((grid:foreign-pointer result) :pointer))
   :definition :generic
   :element-types :complex
@@ -63,7 +63,7 @@
      &key (stride 1)
      (result (grid:make-foreign-array element-type :dimensions (grid:dimensions vector))))
   ("gsl_dft" :type "_inverse")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((grid:foreign-pointer result) :pointer))
   :definition :generic
   :element-types :complex
@@ -79,7 +79,7 @@
      &key (stride 1)
      (result (grid:make-foreign-array element-type :dimensions (grid:dimensions vector))))
   ("gsl_dft" :type "_transform")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((grid:foreign-pointer result) :pointer))
   :definition :generic
   :element-types :complex
diff --git a/fast-fourier-transforms/forward.lisp b/fast-fourier-transforms/forward.lisp
index e20508ae45624598358f92865b21515f485b9ea3..accb317e1fb3b51f48a5bff92c4d6c81e567d81b 100644
--- a/fast-fourier-transforms/forward.lisp
+++ b/fast-fourier-transforms/forward.lisp
@@ -1,6 +1,6 @@
 ;; Forward FFT.
 ;; Sumant Oemrawsingh, Sat Oct 31 2009 - 23:48
-;; Time-stamp: <2011-01-10 17:59:23EST forward.lisp>
+;; Time-stamp: <2012-01-13 12:01:31EST forward.lisp>
 ;;
 ;; Copyright 2009, 2011 Sumant Oemrawsingh, Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -37,7 +37,7 @@
    single-float "gsl_fft_real_float_radix2_transform"
    complex-double-float "gsl_fft_complex_radix2_forward"
    complex-single-float "gsl_fft_complex_float_radix2_forward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float-complex
   :inputs (vector)
@@ -56,7 +56,7 @@
 		single-float "gsl_fft_real_float_transform"
 		complex-double-float "gsl_fft_complex_forward"
 		complex-single-float "gsl_fft_complex_float_forward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((mpointer wavetable) :pointer) ((mpointer workspace) :pointer))
   :definition :generic
   :element-types :float-complex
@@ -75,7 +75,7 @@
 (defmfun forward-fourier-transform-halfcomplex-radix2
     ((vector vector) &key (stride 1))
   ("gsl_fft_halfcomplex" :type "_radix2_transform")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float
   :inputs (vector)
@@ -92,7 +92,7 @@
      (wavetable (make-fft-wavetable element-type (floor (size vector) stride) t))
      (workspace (make-fft-workspace element-type (floor (size vector) stride))))
   ("gsl_fft_halfcomplex" :type "_transform")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((mpointer wavetable) :pointer) ((mpointer workspace) :pointer))
   :definition :generic
   :element-types :float
@@ -111,7 +111,7 @@
 
 (defmfun forward-fourier-transform-dif-radix2 ((vector vector) &key (stride 1))
   ("gsl_fft" :type "_radix2_dif_forward")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :complex
   :inputs (vector)
diff --git a/fast-fourier-transforms/inverse.lisp b/fast-fourier-transforms/inverse.lisp
index 27c89e07d441758a2ab144def96ed7408c6a8464..b4693bbeaef0db94a167f70be50b9e64e3dd99be 100644
--- a/fast-fourier-transforms/inverse.lisp
+++ b/fast-fourier-transforms/inverse.lisp
@@ -1,6 +1,6 @@
 ;; Inverse FFT
 ;; Sumant Oemrawsingh, Sat Oct 24 2009 - 12:55
-;; Time-stamp: <2011-01-11 23:34:17EST inverse.lisp>
+;; Time-stamp: <2012-01-13 12:01:30EST inverse.lisp>
 ;;
 ;; Copyright 2009, 2011 Sumant Oemrawsingh, Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
 (defmfun inverse-fourier-transform-radix2
   ((vector vector) &key (stride 1))
   ("gsl_fft" :type "_radix2_inverse")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :complex
   :inputs (vector)
@@ -49,7 +49,7 @@
      (wavetable (make-fft-wavetable element-type (floor (size vector) stride)))
      (workspace (make-fft-workspace element-type (floor (size vector) stride))))
   ("gsl_fft" :type "_inverse")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((mpointer wavetable) :pointer) ((mpointer workspace) :pointer))
   :definition :generic
   :element-types :complex
@@ -69,7 +69,7 @@
 (defmfun inverse-fourier-transform-halfcomplex-radix2
     ((vector vector) &key (stride 1))
   ("gsl_fft_halfcomplex" :type "_radix2_inverse")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float
   :inputs (vector)
@@ -86,7 +86,7 @@
      (wavetable (make-fft-wavetable element-type (floor (size vector) stride) t))
      (workspace (make-fft-workspace element-type (floor (size vector) stride))))
   ("gsl_fft_halfcomplex" :type "_inverse")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet)
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet)
    ((mpointer wavetable) :pointer) ((mpointer workspace) :pointer))
   :definition :generic
   :element-types :float
@@ -106,7 +106,7 @@
 (defmfun inverse-fourier-transform-dif-radix2
   ((vector vector) &key (stride 1))
   ("gsl_fft" :type "_radix2_dif_inverse")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :complex
   :inputs (vector)
diff --git a/fast-fourier-transforms/select-direction.lisp b/fast-fourier-transforms/select-direction.lisp
index c505e424d8798cd64495fe4addaa13984c2ef67f..546685ee76a5beed97d4916f7414b6e2a3fcf841 100644
--- a/fast-fourier-transforms/select-direction.lisp
+++ b/fast-fourier-transforms/select-direction.lisp
@@ -1,6 +1,6 @@
 ;; FFT where direction is selected.
 ;; Sumant Oemrawsingh, Sat Oct 24 2009 - 12:55
-;; Time-stamp: <2011-01-10 17:59:24EST select-direction.lisp>
+;; Time-stamp: <2012-01-13 12:01:30EST select-direction.lisp>
 ;;
 ;; Copyright 2009, 2011 Sumant Oemrawsingh, Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -26,7 +26,7 @@
 (defmfun fourier-transform-radix2
     ((vector vector) direction &key (stride 1) (n (expt 2 (floor (log (size vector) 2)))))
   ("gsl_fft" :type "_radix2_transform")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) (n sizet) (direction fft-direction))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) (n :sizet) (direction fft-direction))
   :definition :generic
   :element-types :complex
   :inputs (vector)
@@ -40,7 +40,7 @@
 (defmfun fourier-transform-dif-radix2
     ((vector vector) direction &key (stride 1) (n (expt 2 (floor (log (size vector) 2)))))
   ("gsl_fft" :type "_radix2_dif_transform")
-  (((grid:foreign-pointer vector) :pointer) (stride sizet) (n sizet) (direction fft-direction))
+  (((grid:foreign-pointer vector) :pointer) (stride :sizet) (n :sizet) (direction fft-direction))
   :definition :generic
   :element-types :complex
   :inputs (vector)
diff --git a/fast-fourier-transforms/unpack.lisp b/fast-fourier-transforms/unpack.lisp
index da474a8a8d7b5e35bb2aa594920a03188b3be640..252bc20dd805d48d50029881ece41732f47e9160 100644
--- a/fast-fourier-transforms/unpack.lisp
+++ b/fast-fourier-transforms/unpack.lisp
@@ -1,6 +1,6 @@
 ;; Unpack functions for FFT vectors.
 ;; Sumant Oemrawsingh, Sun Oct 25 2009 - 16:35
-;; Time-stamp: <2011-01-10 17:59:24EST unpack.lisp>
+;; Time-stamp: <2012-01-13 12:01:29EST unpack.lisp>
 ;;
 ;; Copyright 2009, 2011 Sumant Oemrawsingh, Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
   ("gsl_fft_real" :type "_unpack")
   (((grid:foreign-pointer vector) :pointer)
    ((grid:foreign-pointer output) :pointer)
-   (stride sizet) ((floor (size vector) stride) sizet))
+   (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float
   :inputs (vector output)
@@ -60,7 +60,7 @@
   ("gsl_fft_halfcomplex" :type "_radix2_unpack")
   (((grid:foreign-pointer vector) :pointer)
    ((grid:foreign-pointer output) :pointer)
-   (stride sizet) ((floor (size vector) stride) sizet))
+   (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float
   :inputs (vector output)
@@ -83,7 +83,7 @@
   ("gsl_fft_halfcomplex" :type "_unpack")
   (((grid:foreign-pointer vector) :pointer)
    ((grid:foreign-pointer output) :pointer)
-   (stride sizet) ((floor (size vector) stride) sizet))
+   (stride :sizet) ((floor (size vector) stride) :sizet))
   :definition :generic
   :element-types :float
   :inputs (vector output)
diff --git a/fast-fourier-transforms/wavetable-workspace.lisp b/fast-fourier-transforms/wavetable-workspace.lisp
index b6b7aa204d1e6dafce9968b5389decf9cebecac1..05405ec312b4a0389833839f669a6f61e4830ff9 100644
--- a/fast-fourier-transforms/wavetable-workspace.lisp
+++ b/fast-fourier-transforms/wavetable-workspace.lisp
@@ -1,6 +1,6 @@
 ;; Wavetable and workspace object definitions.
 ;; Sumant Oemrawsingh, Sun Oct 25 2009 - 16:35
-;; Time-stamp: <2009-12-27 09:45:32EST wavetable-workspace.lisp>
+;; Time-stamp: <2012-01-13 12:01:32EST wavetable-workspace.lisp>
 ;;
 ;; Copyright 2009 Sumant Oemrawsingh, Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
 ;; /usr/include/gsl/gsl_fft_real_float.h
 
 (defmobject fft-real-wavetable-double-float
-    "gsl_fft_real_wavetable" ((n sizet))
+    "gsl_fft_real_wavetable" ((n :sizet))
   "structure that holds the factorization and trigonometric lookup tables for
   the mixed radix real fft algorithm"
   :export nil
@@ -55,7 +55,7 @@
   or inverse half-complex transforms.")
 
 (defmobject fft-real-wavetable-single-float
-    "gsl_fft_real_wavetable_float" ((n sizet))
+    "gsl_fft_real_wavetable_float" ((n :sizet))
   "structure that holds the factorization and trigonometric lookup tables for
   the mixed radix real float fft algorithm"
   :export nil
@@ -77,7 +77,7 @@
   or inverse half-complex transforms.")
 
 (defmobject fft-real-workspace-double-float
-    "gsl_fft_real_workspace" ((n sizet))
+    "gsl_fft_real_workspace" ((n :sizet))
   "Structure that holds the additional working space required for the
   intermediate steps of the mixed radix real fft algoritms"
   :export nil
@@ -85,7 +85,7 @@
   "This function allocates a workspace for a real transform of length n.")
 
 (defmobject fft-real-workspace-single-float
-    "gsl_fft_real_workspace_float" ((n sizet))
+    "gsl_fft_real_workspace_float" ((n :sizet))
   "Structure that holds the additional working space required for the
   intermediate steps of the mixed radix real float fft algoritms"
   :export nil
@@ -101,7 +101,7 @@
 ;; /usr/include/gsl/gsl_fft_complex_float.h
 
 (defmobject fft-complex-wavetable-double-float
-    "gsl_fft_complex_wavetable" ((n sizet))
+    "gsl_fft_complex_wavetable" ((n :sizet))
   "structure that holds the factorization and trigonometric lookup tables for
   the mixed radix complex fft algorithm"
   :export nil
@@ -123,7 +123,7 @@
   inverse) transforms of a given length.")
 
 (defmobject fft-complex-wavetable-single-float
-    "gsl_fft_complex_wavetable_float" ((n sizet))
+    "gsl_fft_complex_wavetable_float" ((n :sizet))
   "structure that holds the factorization and trigonometric lookup tables for
   the mixed radix complex float fft algorithm"
   :export nil
@@ -145,7 +145,7 @@
   inverse) transforms of a given length.")
 
 (defmobject fft-complex-workspace-double-float
-    "gsl_fft_complex_workspace" ((n sizet))
+    "gsl_fft_complex_workspace" ((n :sizet))
   "Structure that holds the additional working space required for the
   intermediate steps of the mixed radix complex fft algoritms"
   :export nil
@@ -153,7 +153,7 @@
   "This function allocates a workspace for a complex transform of length n.")
 
 (defmobject fft-complex-workspace-single-float
-    "gsl_fft_complex_workspace_float" ((n sizet))
+    "gsl_fft_complex_workspace_float" ((n :sizet))
   "Structure that holds the additional working space required for the
   intermediate steps of the mixed radix complex float fft algoritms"
   :export nil
@@ -169,7 +169,7 @@
 ;; /usr/include/gsl/gsl_fft_halfcomplex_float.h
 
 (defmobject fft-half-complex-wavetable-double-float
-    "gsl_fft_halfcomplex_wavetable" ((n sizet))
+    "gsl_fft_halfcomplex_wavetable" ((n :sizet))
   "structure that holds the factorization and trigonometric lookup tables for
   the mixed radix halfcomplex fft algorithm"
   :export nil
@@ -191,7 +191,7 @@
   or inverse half-complex transforms.")
 
 (defmobject fft-half-complex-wavetable-single-float
-    "gsl_fft_halfcomplex_wavetable_float" ((n sizet))
+    "gsl_fft_halfcomplex_wavetable_float" ((n :sizet))
   "structure that holds the factorization and trigonometric lookup tables for
   the mixed radix real float fft algorithm"
   :export nil
diff --git a/hankel.lisp b/hankel.lisp
index b89ddeb2b99dd7f879a2c2bf90e9f1ad61a84dba..414e414eed808f49bb9a5ac12d29fcc08e2a2f4e 100644
--- a/hankel.lisp
+++ b/hankel.lisp
@@ -1,6 +1,6 @@
 ;; Discrete Hankel Transforms.
 ;; Liam Healy, Sat Dec  8 2007 - 16:50
-;; Time-stamp: <2011-05-26 12:37:29EDT hankel.lisp>
+;; Time-stamp: <2012-01-13 12:01:11EST hankel.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
 
 ;;; Create the Hankel transform object and essential methods/functions.
 (defmobject hankel "gsl_dht"
-  ((size sizet))
+  ((size :sizet))
   "discrete Hankel Transform"
   :documentation
   "Allocate a Discrete Hankel transform object of the given size and
diff --git a/histogram/histogram.lisp b/histogram/histogram.lisp
index 0ef039ef3caca1ac8694a75bbd20eb2e81a3a42a..45b16690ff5aa59c7d10678bb0e7be556e7fea46 100644
--- a/histogram/histogram.lisp
+++ b/histogram/histogram.lisp
@@ -1,6 +1,6 @@
 ;; The histogram structure
 ;; Liam Healy, Mon Jan  1 2007 - 11:32
-;; Time-stamp: <2011-01-10 17:59:25EST histogram.lisp>
+;; Time-stamp: <2012-01-13 12:01:28EST histogram.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -27,19 +27,19 @@
 
 (defmobject histogram
     "gsl_histogram"
-  ((number-of-bins sizet))
+  ((number-of-bins :sizet))
   "one-dimensional histogram, including bin boundaries and bin contents"
   :initialize-suffix "set_ranges"
-  :initialize-args (((grid:foreign-pointer ranges) :pointer) ((dim0 ranges) sizet)))
+  :initialize-args (((grid:foreign-pointer ranges) :pointer) ((dim0 ranges) :sizet)))
 
 (defmobject histogram2d
     "gsl_histogram2d"
-  ((number-of-bins-x sizet) (number-of-bins-y sizet))
+  ((number-of-bins-x :sizet) (number-of-bins-y :sizet))
   "two-dimensional histogram, including bin boundaries and bin contents."
   :initialize-suffix "set_ranges"
   :initialize-args
-  (((grid:foreign-pointer x-ranges) :pointer) ((dim0 x-ranges) sizet)
-   ((grid:foreign-pointer y-ranges) :pointer) ((dim0 y-ranges) sizet)))
+  (((grid:foreign-pointer x-ranges) :pointer) ((dim0 x-ranges) :sizet)
+   ((grid:foreign-pointer y-ranges) :pointer) ((dim0 y-ranges) :sizet)))
 
 ;;; GSL documentation does not state what the return value for the
 ;;; C function for reinitialization means; assumed to be error code.
diff --git a/histogram/ntuple.lisp b/histogram/ntuple.lisp
index f451960519bd81fd1a6827ee6bb5912a8716bf9f..facc5d80825129000242b3ba33b16b0ec62fa24b 100644
--- a/histogram/ntuple.lisp
+++ b/histogram/ntuple.lisp
@@ -1,6 +1,6 @@
 ;; N-tuples
 ;; Liam Healy Sat Feb  3 2007 - 12:53
-;; Time-stamp: <2011-10-30 10:09:06EDT ntuple.lisp>
+;; Time-stamp: <2012-01-13 12:01:27EST ntuple.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -26,7 +26,7 @@
 (defmfun create-ntuple (filename data foreign-type)
   "gsl_ntuple_create"
   ((filename :string) (data :pointer)
-   ((cffi:foreign-type-size foreign-type) sizet))
+   ((cffi:foreign-type-size foreign-type) :sizet))
   :c-return :pointer
   :documentation			; FDL
   "Create a new write-only ntuple file filename for
@@ -40,7 +40,7 @@
 (defmfun open-ntuple (filename data foreign-type)
   "gsl_ntuple_open"
   ((filename :string) (data :pointer)
-   ((cffi:foreign-type-size foreign-type) sizet))
+   ((cffi:foreign-type-size foreign-type) :sizet))
   :c-return :pointer
   :documentation			; FDL
   "Open an existing ntuple file filename for reading
diff --git a/histogram/probability-distribution.lisp b/histogram/probability-distribution.lisp
index be37634a203869de9f1dbe951c5c1db46e893a8a..1abc63b247825dca3f30792b418f408245f6184d 100644
--- a/histogram/probability-distribution.lisp
+++ b/histogram/probability-distribution.lisp
@@ -1,6 +1,6 @@
 ;; Histogram probability distribution.
 ;; Liam Healy, Mon Jan  1 2007 - 17:51
-;; Time-stamp: <2009-12-27 09:47:39EST probability-distribution.lisp>
+;; Time-stamp: <2012-01-13 12:01:29EST probability-distribution.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
 
 (defmobject histogram-pdf
     "gsl_histogram_pdf"
-  ((number-of-bins sizet))
+  ((number-of-bins :sizet))
   "one-dimensional histogram PDF"
   :documentation
   "Optionally initialize the probability distribution pdf with the contents
@@ -37,7 +37,7 @@
 
 (defmobject histogram2d-pdf
     "gsl_histogram2d_pdf"
-  ((number-of-bins-x sizet) (number-of-bins-y sizet))
+  ((number-of-bins-x :sizet) (number-of-bins-y :sizet))
   "two-dimensional histogram PDF"
   :documentation
   "Optionally initialize the probability distribution pdf with the contents
diff --git a/histogram/statistics.lisp b/histogram/statistics.lisp
index af7466ddb80a62d116216ea66d667fd0f69d0d05..3f57f351a173e465a0dc5b1679264a702386a8d8 100644
--- a/histogram/statistics.lisp
+++ b/histogram/statistics.lisp
@@ -1,6 +1,6 @@
 ;; Statistics of histograms.
 ;; Liam Healy, Mon Jan  1 2007 - 16:13
-;; Time-stamp: <2009-12-27 09:48:06EST statistics.lisp>
+;; Time-stamp: <2012-01-13 12:01:28EST statistics.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -59,7 +59,7 @@
   "gsl_histogram_max_bin"
   (((mpointer histogram) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :documentation			; FDL
   "The index of the bin containing the maximum value. In the case
    where several bins contain the same maximum value the smallest
@@ -68,7 +68,7 @@
 (defmfun max-index ((histogram histogram2d))
   "gsl_histogram2d_max_bin"
   (((mpointer histogram) :pointer)
-   (xindex (:pointer sizet)) (yindex (:pointer sizet)))
+   (xindex (:pointer :sizet)) (yindex (:pointer :sizet)))
   :definition :method
   :c-return :void
   :documentation			; FDL
@@ -80,7 +80,7 @@
   "gsl_histogram_min_bin"
   (((mpointer histogram) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :documentation			; FDL
   "The index of the bin containing the minimum value. In the case
    where several bins contain the same minimum value the smallest
@@ -89,7 +89,7 @@
 (defmfun min-index ((histogram histogram2d))
   "gsl_histogram2d_min_bin"
   (((mpointer histogram) :pointer)
-   (xindex (:pointer sizet)) (yindex (:pointer sizet)))
+   (xindex (:pointer :sizet)) (yindex (:pointer :sizet)))
   :definition :method
   :c-return :void
   :documentation			; FDL
diff --git a/histogram/updating-accessing.lisp b/histogram/updating-accessing.lisp
index 1c83e56dfa9f3a5d40fb03f9bd9e2c719fa65ee4..6785413c4d6169f8c7f8a6c5fb1d695f6409ee81 100644
--- a/histogram/updating-accessing.lisp
+++ b/histogram/updating-accessing.lisp
@@ -1,6 +1,6 @@
 ;; Updating and accessing histogram elements.
 ;; Liam Healy, Mon Jan  1 2007 - 14:43
-;; Time-stamp: <2011-09-12 17:35:27EDT updating-accessing.lisp>
+;; Time-stamp: <2012-01-13 12:01:27EST updating-accessing.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -47,7 +47,7 @@
 
 (defmfun grid:aref ((histogram histogram) &rest indices)
   "gsl_histogram_get"
-  (((mpointer histogram) :pointer) ((first indices) sizet))
+  (((mpointer histogram) :pointer) ((first indices) :sizet))
   :definition :method 
   :c-return :double
   :index grid:aref
@@ -58,7 +58,7 @@
 
 (defmfun range (histogram i)
   "gsl_histogram_get_range"
-  (((mpointer histogram) :pointer) (i sizet)
+  (((mpointer histogram) :pointer) (i :sizet)
    (lower (:pointer :double)) (upper (:pointer :double)))
   :documentation			; FDL
   "Find the upper and lower range limits of the i-th
@@ -89,7 +89,7 @@
   "gsl_histogram_bins"
   (((mpointer histogram) :pointer))
   :definition :method
-  :c-return (dim sizet)
+  :c-return (dim :sizet)
   :return ((list dim))
   :documentation			; FDL
   "The number of bins in the histogram.")
@@ -104,9 +104,9 @@
 
 (defmfun histogram-find (histogram x-value &optional y-value)
   ("gsl_histogram_find" "gsl_histogram2d_find")
-  ((((mpointer histogram) :pointer) (x-value :double) (bin (:pointer sizet)))
+  ((((mpointer histogram) :pointer) (x-value :double) (bin (:pointer :sizet)))
    (((mpointer histogram) :pointer) (x-value :double) (y-value :double)
-   (xbin (:pointer sizet)) (ybin (:pointer sizet))))
+   (xbin (:pointer :sizet)) (ybin (:pointer :sizet))))
   :documentation			; FDL
   "Finds the bin number which covers the coordinate value in
    the histogram.  The bin is located using a binary search. The
diff --git a/init/callback-struct.lisp b/init/callback-struct.lisp
index 942319e07ebf409e1f1d9da6caa2d68ffa5dab41..a735a9deb0d7d19fb1f7f0953bdf1e9330ce2349 100644
--- a/init/callback-struct.lisp
+++ b/init/callback-struct.lisp
@@ -1,6 +1,6 @@
 ;; GSL structures for holding functions
 ;; Liam Healy 2009-04-04 22:15:56EDT callback-struct.lisp
-;; Time-stamp: <2010-05-23 11:36:41EDT callback-struct.lisp>
+;; Time-stamp: <2012-01-13 12:01:26EST callback-struct.lisp>
 ;;
 ;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -50,7 +50,7 @@
 ;;; also defined in /usr/include/gsl/gsl_monte.h
 (cstruct fnstruct-dimension "gsl_multiroot_function"
   (function "f" :type :pointer)
-  (dimension "n" :type sizet)
+  (dimension "n" :type :sizet)
   (parameters "params" :type :pointer))
 
 ;;; The function, dimension, and derivatives
@@ -58,7 +58,7 @@
   (function "f" :type :pointer)
   (df "df" :type :pointer)
   (fdf "fdf" :type :pointer)
-  (dimension "n" :type sizet)
+  (dimension "n" :type :sizet)
   (parameters "params" :type :pointer))
 
 (include "gsl/gsl_multifit_nlin.h") 
@@ -66,8 +66,8 @@
 ;;; The function and two dimensions (for nonlinear fit).
 (cstruct fnstruct-fit "gsl_multifit_function"
   (function "f" :type :pointer)
-  (number-of-observations "n" :type sizet)
-  (number-of-parameters "p" :type sizet)
+  (number-of-observations "n" :type :sizet)
+  (number-of-parameters "p" :type :sizet)
   (parameters "params" :type :pointer))
 
 ;;; The function, two dimensions, and derivatives (for nonlinear fit)
@@ -75,6 +75,6 @@
   (function "f" :type :pointer)
   (df "df" :type :pointer)
   (fdf "fdf" :type :pointer)
-  (number-of-observations "n" :type sizet)
-  (number-of-parameters "p" :type sizet)
+  (number-of-observations "n" :type :sizet)
+  (number-of-parameters "p" :type :sizet)
   (parameters "params" :type :pointer))
diff --git a/init/init.lisp b/init/init.lisp
index 0aab72a7a29a51a04cfe526c6b6331f87c54044c..cd1cc9b068e048df50597d30bf893773ca4f8328 100644
--- a/init/init.lisp
+++ b/init/init.lisp
@@ -1,6 +1,6 @@
 ;; Load GSL
 ;; Liam Healy Sat Mar  4 2006 - 18:53
-;; Time-stamp: <2011-10-23 21:57:41EDT init.lisp>
+;; Time-stamp: <2012-01-13 12:03:27EST init.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -22,7 +22,6 @@
     (:nicknames :gsl)
   (:use :common-lisp :cffi)
   (:import-from :grid #:dim0 #:dim1 #:^ #:copy)
-  #+fsbv (:import-from :cffi-fsbv #:sizet) ; and what do we do if #-fsbv?
   (:export #:dim0 #:dim1 #:copy)
   ;; No actual conflict due to different usage of symbols:
   ;; antik:psi means "pounds per square inch" vs. function #'gsl:psi
diff --git a/init/libgsl-unix.lisp b/init/libgsl-unix.lisp
index ff4e1837671b342c929ad716fdbc7a69f3e4b4bf..09547932d8c09c01f9a4e7003dfed3c698f7957c 100644
--- a/init/libgsl-unix.lisp
+++ b/init/libgsl-unix.lisp
@@ -1,6 +1,6 @@
 ;; CFFI-Grovel definitions for unix systems.
 ;; Liam Healy 2009-05-25 13:10:50EDT libgsl-unix.lisp
-;; Time-stamp: <2010-05-23 11:24:56EDT libgsl-unix.lisp>
+;; Time-stamp: <2012-01-13 12:01:08EST libgsl-unix.lisp>
 ;;
 ;; Copyright 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -163,5 +163,3 @@
     ((:ETOLX "GSL_ETOLX"))
     ((:ETOLG "GSL_ETOLG"))
     ((:EOF "GSL_EOF")))
-
-(ctype sizet "size_t")
diff --git a/interpolation/interpolation.lisp b/interpolation/interpolation.lisp
index dd5a83fe2c08b995a4e9290261dbe6df571c1d5e..894cbcc99e1d56b9ef6878d5765ad3fc969f2372 100644
--- a/interpolation/interpolation.lisp
+++ b/interpolation/interpolation.lisp
@@ -1,6 +1,6 @@
 ;; Interpolation allocation, initialization, and freeing.
 ;; Liam Healy, Sun Nov  4 2007 - 17:24
-;; Time-stamp: <2011-01-10 17:59:26EST interpolation.lisp>
+;; Time-stamp: <2012-01-13 12:01:26EST interpolation.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -26,7 +26,7 @@
 ;;; A spline is an interpolation that also stores the arrays xa and ya,
 ;;; so they need not be supplied on each call.
 (defmobject interpolation "gsl_interp"
-  ((type :pointer) (size sizet))
+  ((type :pointer) (size :sizet))
   "interpolation"
   :documentation			; FDL
   "Make an interpolation object of type for size data-points,
@@ -37,7 +37,7 @@
   strictly ordered; the behavior for other arrangements is not defined."
   :initialize-suffix "init"
   :initialize-args
-  (((grid:foreign-pointer xa) :pointer) ((grid:foreign-pointer ya) :pointer) ((dim0 xa) sizet))
+  (((grid:foreign-pointer xa) :pointer) ((grid:foreign-pointer ya) :pointer) ((dim0 xa) :sizet))
   :arglists-function
   (lambda (set)
     `((type &optional xa-or-size (ya nil ,set))
@@ -45,13 +45,13 @@
       (:xa xa-or-size :ya ya))))
 
 (defmobject spline "gsl_spline"
-  ((type :pointer) (size sizet))
+  ((type :pointer) (size :sizet))
   "spline"
   :documentation			; FDL
   "Make an interpolation object of type for size data-points."
   :initialize-suffix "init"
   :initialize-args
-  (((grid:foreign-pointer xa) :pointer) ((grid:foreign-pointer ya) :pointer) ((dim0 xa) sizet))
+  (((grid:foreign-pointer xa) :pointer) ((grid:foreign-pointer ya) :pointer) ((dim0 xa) :sizet))
   :inputs (xa ya)
   :arglists-function
   (lambda (set)
diff --git a/interpolation/lookup.lisp b/interpolation/lookup.lisp
index 78b754c6c6bd84b42db90d1807196643541e142c..3ad85e7122828308a38daa71411189d88db08499 100644
--- a/interpolation/lookup.lisp
+++ b/interpolation/lookup.lisp
@@ -1,6 +1,6 @@
 ;; Index lookup and acceleration
 ;; Liam Healy, Sun Nov  4 2007 - 18:09
-;; Time-stamp: <2011-01-13 10:24:57EST lookup.lisp>
+;; Time-stamp: <2012-01-13 12:01:25EST lookup.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,8 +31,8 @@
 
 (defmfun interpolation-search (x-array x low-index high-index)
   "gsl_interp_bsearch"
-  ((x-array :pointer) (x :double) (low-index sizet) (high-index sizet))
-  :c-return sizet
+  ((x-array :pointer) (x :double) (low-index :sizet) (high-index :sizet))
+  :c-return :sizet
   :documentation			; FDL
   "Find the index i of the array x-array such
    that x-array[i] <= x < x-array[i+1].  The index is searched for
@@ -41,7 +41,7 @@
 (defmfun accelerated-interpolation-search (x-array x acceleration)
   "gsl_interp_accel_find"
   (((mpointer acceleration) :pointer) (x-array :pointer) (x :double))
-  :c-return sizet
+  :c-return :sizet
   :documentation			; FDL
   "Search the data array x-array of size, using the given acceleration.
    This is how lookups are performed during evaluation of an interpolation.  The
diff --git a/linear-algebra/blas1.lisp b/linear-algebra/blas1.lisp
index 42660a81981cff8b38b8025b2ade77da2ed7f9e3..3584a6497ab0a34d5e90b8f5f1e747966bf0046e 100644
--- a/linear-algebra/blas1.lisp
+++ b/linear-algebra/blas1.lisp
@@ -1,6 +1,6 @@
 ;; BLAS level 1, Vector operations
 ;; Liam Healy, Wed Apr 26 2006 - 15:23
-;; Time-stamp: <2011-05-26 12:37:34EDT blas1.lisp>
+;; Time-stamp: <2012-01-13 12:01:25EST blas1.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -79,7 +79,7 @@
   (((mpointer vec) :pointer))
   :definition :generic
   :element-types :float-complex
-  :c-return sizet
+  :c-return :sizet
   :inputs (vec)
   :documentation			; FDL
   "The index of the largest element of the vector
diff --git a/ordinary-differential-equations/control.lisp b/ordinary-differential-equations/control.lisp
index d5809119f926bfa61802ea70d6ef6bb71216f99d..3de9660ce6e263cbe6525b0742af6fc322f30b8b 100644
--- a/ordinary-differential-equations/control.lisp
+++ b/ordinary-differential-equations/control.lisp
@@ -1,6 +1,6 @@
 ;; Adaptive step-size control
 ;; Liam Healy 2008-02-17 17:30:04EST control.lisp
-;; Time-stamp: <2009-12-27 09:56:56EST control.lisp>
+;; Time-stamp: <2012-01-13 12:01:24EST control.lisp>
 ;;
 ;; Copyright 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -104,7 +104,7 @@
     "gsl_odeiv_control_scaled"
   ((absolute-error :double) (relative-error :double)
    (y-scaling :double) (dydt-scaling :double)
-   (absolute-scale :pointer) (dimension sizet))
+   (absolute-scale :pointer) (dimension :sizet))
   "scaled control for ordinary differential equations"
   :superclasses (ode-control)
   :initialize-name "gsl_odeiv_control_init"
diff --git a/ordinary-differential-equations/evolution.lisp b/ordinary-differential-equations/evolution.lisp
index e851cbbfdfb828b750bfd9a056052308e93eaf2e..4cc71f1617f35ab65718d59f3fc953fa19910b39 100644
--- a/ordinary-differential-equations/evolution.lisp
+++ b/ordinary-differential-equations/evolution.lisp
@@ -1,6 +1,6 @@
 ;; Evolution functions for ODE integration.
 ;; Liam Healy, Sun Sep 30 2007 - 14:31
-;; Time-stamp: <2011-01-10 18:16:19EST evolution.lisp>
+;; Time-stamp: <2012-01-13 12:01:23EST evolution.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 (in-package :gsl)
 
 (defmobject ode-evolution "gsl_odeiv_evolve"
-  ((grid:dimensions sizet))
+  ((grid:dimensions :sizet))
   "evolution for ordinary differential equations"
   :documentation "Make an object to advance the ODE solution."
   :initialize-suffix "reset"
diff --git a/ordinary-differential-equations/ode-struct.lisp b/ordinary-differential-equations/ode-struct.lisp
index 44621df33d24c2b5b499e32e1391be7be16a9869..88f20a13e05cb07cf40f17f67cd1bee7bab2b3cd 100644
--- a/ordinary-differential-equations/ode-struct.lisp
+++ b/ordinary-differential-equations/ode-struct.lisp
@@ -1,6 +1,6 @@
 ;; Define the structure for ODEs
 ;; Liam Healy 2009-06-06 16:42:29EDT ode-struct.lisp
-;; Time-stamp: <2010-05-23 11:37:27EDT ode-struct.lisp>
+;; Time-stamp: <2012-01-13 12:01:24EST ode-struct.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -33,5 +33,5 @@
 (cstruct ode-system "gsl_odeiv_system"
   (function "function" :type :pointer) 
   (jacobian "jacobian" :type :pointer)
-  (dimension "dimension" :type sizet)
+  (dimension "dimension" :type :sizet)
   (parameters "params" :type :pointer))
diff --git a/ordinary-differential-equations/stepping.lisp b/ordinary-differential-equations/stepping.lisp
index e03a55ab1f71f8eca5c4feeb01b4c5a9147e0963..c22995396869214a90e75c1c1b481f5894faa9be 100644
--- a/ordinary-differential-equations/stepping.lisp
+++ b/ordinary-differential-equations/stepping.lisp
@@ -1,6 +1,6 @@
 ;; Stepping functions for ODE systems.
 ;; Liam Healy, Mon Sep 24 2007 - 21:33
-;; Time-stamp: <2011-10-30 09:55:50EDT stepping.lisp>
+;; Time-stamp: <2012-01-13 12:01:23EST stepping.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 (in-package :gsl)
 
 (defmobject ode-stepper "gsl_odeiv_step"
-  ((type :pointer) ((first dimensions) sizet))
+  ((type :pointer) ((first dimensions) :sizet))
   "stepper for ordinary differential equations"
   :documentation
   "Make a stepper for ordinary differential equations.  The type is
diff --git a/polynomial.lisp b/polynomial.lisp
index 022a7297d5c1c8a89f159583f4d705c23e295aea..d809fae4e4cf02509ee31cbf6edf9306d73c1bd7 100644
--- a/polynomial.lisp
+++ b/polynomial.lisp
@@ -1,6 +1,6 @@
 ;; Polynomials
 ;; Liam Healy, Tue Mar 21 2006 - 18:33
-;; Time-stamp: <2011-10-29 23:21:19EDT polynomial.lisp>
+;; Time-stamp: <2012-01-13 12:01:12EST polynomial.lisp>
 ;;
 ;; Copyright 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -29,11 +29,11 @@
 (defmfun evaluate
     ((coefficients grid:vector-double-float) (x float) &key divided-difference)
   ("gsl_poly_eval" "gsl_poly_dd_eval")
-  ((((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) sizet)
+  ((((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) :sizet)
     (x :double))
    (((grid:foreign-pointer divided-difference) :pointer)
     ((grid:foreign-pointer coefficients) :pointer)
-    ((dim0 coefficients) sizet)
+    ((dim0 coefficients) :sizet)
     (x :double)))
   :definition :method
   :inputs (coefficients divided-difference)
@@ -46,7 +46,7 @@
     ((coefficients grid:vector-double-float) (x complex)
      &key)
   "gsl_poly_complex_eval"
-  (((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) sizet)
+  (((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) :sizet)
    (x (:struct grid:complex-double-c)))
   :definition :method
   :gsl-version (1 11)
@@ -60,7 +60,7 @@
     ((coefficients grid:vector-complex-double-float) (x complex)
      &key)
   "gsl_complex_poly_complex_eval"
-  (((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) sizet)
+  (((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) :sizet)
    (x (:struct grid:complex-double-c)))
   :definition :method
   :gsl-version (1 11)
@@ -78,7 +78,7 @@
   "gsl_poly_dd_init"
   (((grid:foreign-pointer dd) :pointer)
    ((grid:foreign-pointer xa) :pointer) ((grid:foreign-pointer ya) :pointer)
-   ((dim0 xa) sizet))
+   ((dim0 xa) :sizet))
   :inputs (xa ya)
   :outputs (dd)
   :return (dd)
@@ -99,7 +99,7 @@
    (xp :double)
    ((grid:foreign-pointer dd) :pointer)
    ((grid:foreign-pointer xa) :pointer)
-   ((dim0 xa) sizet)
+   ((dim0 xa) :sizet)
    ((grid:foreign-pointer workspace) :pointer))
   :inputs (dd xa)
   :outputs (coefficients)
@@ -169,7 +169,7 @@
 ;;;;****************************************************************************
 
 (defmobject polynomial-complex-workspace "gsl_poly_complex_workspace"
-  ((n sizet))
+  ((n :sizet))
   "complex workspace for polynomials")
 
 (defmfun polynomial-solve
@@ -179,7 +179,7 @@
 			  :dimensions (1- (size coefficients))))
      (workspace (make-polynomial-complex-workspace (size coefficients))))
   "gsl_poly_complex_solve"
-  (((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) sizet)
+  (((grid:foreign-pointer coefficients) :pointer) ((dim0 coefficients) :sizet)
    ((mpointer workspace) :pointer) ((grid:foreign-pointer answer) :pointer))
   :inputs (coefficients)
   :outputs (answer)
diff --git a/random/dirichlet.lisp b/random/dirichlet.lisp
index e1e493d3854e137ba0e24c52468d29347e281d25..872b6038798e70f8e84f25d11beeacca00c1b2fe 100644
--- a/random/dirichlet.lisp
+++ b/random/dirichlet.lisp
@@ -1,6 +1,6 @@
 ;; Dirichlet distribution
 ;; Liam Healy, Sun Oct 29 2006
-;; Time-stamp: <2011-07-29 12:09:55EDT dirichlet.lisp>
+;; Time-stamp: <2012-01-13 12:01:22EST dirichlet.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
      &key alpha (theta (vdf (dim0 alpha))))
   "gsl_ran_dirichlet"
   (((mpointer generator) :pointer)
-   ((dim0 alpha) sizet)
+   ((dim0 alpha) :sizet)
    ((grid:foreign-pointer alpha) :pointer)
    ;; theta had better be at least as long as alpha, or they'll be trouble
    ((grid:foreign-pointer theta) :pointer))
@@ -54,7 +54,7 @@
 
 (defmfun dirichlet-pdf (alpha theta)
   "gsl_ran_dirichlet_pdf"
-  (((dim0 alpha) sizet)
+  (((dim0 alpha) :sizet)
    ((grid:foreign-pointer alpha) :pointer)
    ;; theta had better be at least as long as alpha, or they'll be trouble
    ((grid:foreign-pointer theta) :pointer))
@@ -67,7 +67,7 @@
 
 (defmfun dirichlet-log-pdf (alpha theta)
   "gsl_ran_dirichlet_lnpdf"
-  (((dim0 alpha) sizet)
+  (((dim0 alpha) :sizet)
    ((grid:foreign-pointer alpha) :pointer)
    ;; theta had better be at least as long as alpha, or they'll be trouble
    ((grid:foreign-pointer theta) :pointer))
diff --git a/random/discrete.lisp b/random/discrete.lisp
index b88a550656b123eca7e595c562dd7481511870ed..9deabe5a6b6b218ef8ccfd5dff5c69b377aacf38 100644
--- a/random/discrete.lisp
+++ b/random/discrete.lisp
@@ -1,6 +1,6 @@
 ;; Discrete random variables
 ;; Liam Healy, Sat Nov 11 2006 - 21:51
-;; Time-stamp: <2011-01-10 17:59:28EST discrete.lisp>
+;; Time-stamp: <2012-01-13 12:01:21EST discrete.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 ;;; /usr/include/gsl/gsl_randist.h
 
 (defmobject discrete-random "gsl_ran_discrete"
-  (((dim0 probabilities) sizet) ((grid:foreign-pointer probabilities) :pointer))
+  (((dim0 probabilities) :sizet) ((grid:foreign-pointer probabilities) :pointer))
   "lookup table for the discrete random number generator"
   :allocator "gsl_ran_discrete_preproc"
   :allocate-inputs (probabilities)
@@ -41,13 +41,13 @@
   "gsl_ran_discrete"
   (((mpointer generator) :pointer) ((mpointer table) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :documentation
   "Generate discrete random numbers.")
 
 (defmfun discrete-pdf (k table)
   "gsl_ran_discrete_pdf"
-  ((k sizet) ((mpointer table) :pointer))
+  ((k :sizet) ((mpointer table) :pointer))
   :c-return :double
   :documentation			; FDL
   "The probability P[k] of observing the variable k.
diff --git a/random/generators.lisp b/random/generators.lisp
index 9c244d39f80b8ee0d331c2fcf85fa0816a4877ba..1bb6ca01e87a68df126626635818b046d8815b96 100644
--- a/random/generators.lisp
+++ b/random/generators.lisp
@@ -1,6 +1,6 @@
 ;; Generators of random numbers.
 ;; Liam Healy, Sat Jul 15 2006 - 14:43
-;; Time-stamp: <2011-10-23 22:02:24EDT generators.lisp>
+;; Time-stamp: <2012-01-13 12:01:19EST generators.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -155,7 +155,7 @@
 (defmfun size ((rng-instance random-number-generator))
   "gsl_rng_size" (((mpointer rng-instance) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :index gsl-random-state)
 
 (export 'gsl-random-state)
diff --git a/random/multinomial.lisp b/random/multinomial.lisp
index f9a96f4ccf62aee49f6485b73400b52049643a2f..fdf8b9bb907958247aaad71076601fb5cbed8841 100644
--- a/random/multinomial.lisp
+++ b/random/multinomial.lisp
@@ -1,6 +1,6 @@
 ;; Multinomial distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2011-08-16 23:57:09EDT multinomial.lisp>
+;; Time-stamp: <2012-01-13 12:01:21EST multinomial.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -29,8 +29,8 @@
 	 '(signed-byte 32) :dimensions (dim0 probabilities))))
   "gsl_ran_multinomial"
   (((mpointer generator) :pointer) 
-   ((dim0 probabilities) sizet)
-   (sum sizet)
+   ((dim0 probabilities) :sizet)
+   (sum :sizet)
    ((grid:foreign-pointer probabilities) :pointer)
    ;; technically, n should be a uint array, but integers work
    ((grid:foreign-pointer n) :pointer))
@@ -56,7 +56,7 @@
 
 (defmfun multinomial-pdf (p n)
   "gsl_ran_multinomial_pdf"
-  (((dim0 p) sizet) ((grid:foreign-pointer p) :pointer) ((grid:foreign-pointer n) :pointer))
+  (((dim0 p) :sizet) ((grid:foreign-pointer p) :pointer) ((grid:foreign-pointer n) :pointer))
   :inputs (p n)
   :c-return :double
   :documentation			; FDL
@@ -66,7 +66,7 @@
 
 (defmfun multinomial-log-pdf (p n)
   "gsl_ran_multinomial_lnpdf"
-  (((dim0 p) sizet) ((grid:foreign-pointer p) :pointer) ((grid:foreign-pointer n) :pointer))
+  (((dim0 p) :sizet) ((grid:foreign-pointer p) :pointer) ((grid:foreign-pointer n) :pointer))
   :inputs (p n)
   :c-return :double
   :documentation			; FDL
diff --git a/random/quasi.lisp b/random/quasi.lisp
index 50059e6e52009cf77d3288f97db8f8a44ff3500a..68b6ada44961f6f6a9556b2464a61ffc6fe9a10f 100644
--- a/random/quasi.lisp
+++ b/random/quasi.lisp
@@ -1,6 +1,6 @@
 ;; Quasi-random sequences in arbitrary dimensions.
 ;; Liam Healy, Sun Jul 16 2006 - 15:54
-;; Time-stamp: <2011-01-10 17:59:29EST quasi.lisp>
+;; Time-stamp: <2012-01-13 12:01:20EST quasi.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -60,7 +60,7 @@
 (defmfun size ((instance quasi-random-number-generator))
   "gsl_qrng_size" (((mpointer instance) :pointer))
   :definition :method
-  :c-return sizet
+  :c-return :sizet
   :export nil
   :index gsl-random-state)
 
diff --git a/random/shuffling-sampling.lisp b/random/shuffling-sampling.lisp
index 47756947a673f62536eb43f4d99a2e2ee0e6c802..ac2bb326dac7517a5f194302ee1a73d5055d5d63 100644
--- a/random/shuffling-sampling.lisp
+++ b/random/shuffling-sampling.lisp
@@ -1,6 +1,6 @@
 ;; Shuffling and sampling
 ;; Liam Healy, Sat Dec  2 2006 - 18:40
-;; Time-stamp: <2011-01-11 23:34:14EST shuffling-sampling.lisp>
+;; Time-stamp: <2012-01-13 12:01:20EST shuffling-sampling.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
      &key base)
   "gsl_ran_shuffle"
   (((mpointer generator) :pointer)
-   ((grid:foreign-pointer base) :pointer) ((dim0 base) sizet) ((grid:element-size base) sizet))
+   ((grid:foreign-pointer base) :pointer) ((dim0 base) :sizet) ((grid:element-size base) :sizet))
   :definition :method
   :inputs (base)
   :outputs (base)
@@ -50,8 +50,8 @@
 	  dest)))
   "gsl_ran_choose"
   (((mpointer generator) :pointer)
-   ((grid:foreign-pointer destarr) :pointer) ((dim0 destarr) sizet)
-   ((grid:foreign-pointer src) :pointer) ((dim0 src) sizet) ((grid:element-size src) sizet))
+   ((grid:foreign-pointer destarr) :pointer) ((dim0 destarr) :sizet)
+   ((grid:foreign-pointer src) :pointer) ((dim0 src) :sizet) ((grid:element-size src) :sizet))
   :definition :method
   :inputs (src)
   :outputs (destarr)
@@ -78,8 +78,8 @@
 	  dest)))
   "gsl_ran_sample"
   (((mpointer generator) :pointer)
-   ((grid:foreign-pointer destarr) :pointer) ((dim0 destarr) sizet)
-   ((grid:foreign-pointer src) :pointer) ((dim0 src) sizet) ((grid:element-size src) sizet))
+   ((grid:foreign-pointer destarr) :pointer) ((dim0 destarr) :sizet)
+   ((grid:foreign-pointer src) :pointer) ((dim0 src) :sizet) ((grid:element-size src) :sizet))
   :definition :method
   :inputs (src)
   :outputs (destarr)
diff --git a/random/spherical-vector.lisp b/random/spherical-vector.lisp
index f8bd795c6fbbf387284dbfd1e9ca4251d2c127da..bc87904789b3f4527e292a09a1724a72569214c7 100644
--- a/random/spherical-vector.lisp
+++ b/random/spherical-vector.lisp
@@ -1,6 +1,6 @@
 ;; Spherical Vector distribution
 ;; Liam Healy, Sun Oct  22 2006
-;; Time-stamp: <2011-01-10 17:59:30EST spherical-vector.lisp>
+;; Time-stamp: <2012-01-13 12:01:20EST spherical-vector.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -67,7 +67,7 @@
 (defmfun sample
     ((generator random-number-generator) (type (eql :direction-Nd)) &key vector)
   "gsl_ran_dir_nd"
-  (((mpointer generator) :pointer) ((dim0 vector) sizet)
+  (((mpointer generator) :pointer) ((dim0 vector) :sizet)
    ((grid:foreign-pointer vector) :pointer))
   :definition :method
   :c-return :void
diff --git a/series-acceleration.lisp b/series-acceleration.lisp
index dc82d42b81d2a8275bf90d155c9ce00c1400c778..20d75ace37e3894ab3d536128da4fceff9a9a176 100644
--- a/series-acceleration.lisp
+++ b/series-acceleration.lisp
@@ -1,6 +1,6 @@
 ;; Series acceleration.
 ;; Liam Healy, Wed Nov 21 2007 - 18:41
-;; Time-stamp: <2011-10-30 09:55:05EDT series-acceleration.lisp>
+;; Time-stamp: <2012-01-13 12:01:09EST series-acceleration.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
   (cffi:foreign-slot-value (mpointer levin) '(:struct levin-c) slot))
 
 (defmobject levin "gsl_sum_levin_u"
-  ((order sizet))
+  ((order :sizet))
   "Levin u-transform"
   :documentation			; FDL
   "Make a workspace for a Levin u-transform of n
@@ -38,7 +38,7 @@
 
 (defmfun accelerate (array levin)
   "gsl_sum_levin_u_accel"
-  (((grid:foreign-pointer array) :pointer) ((dim0 array) sizet) ((mpointer levin) :pointer)
+  (((grid:foreign-pointer array) :pointer) ((dim0 array) :sizet) ((mpointer levin) :pointer)
    (accelerated-sum (:pointer :double)) (abserr (:pointer :double)))
   :inputs (array)
   :documentation			; FDL
@@ -57,7 +57,7 @@
 ;;;;****************************************************************************
 
 (defmobject levin-truncated "gsl_sum_levin_utrunc"
-  ((order sizet))
+  ((order :sizet))
   "truncated Levin u-transform"
   :documentation			; FDL
   "Make a workspace for a Levin u-transform of n
@@ -66,7 +66,7 @@
 
 (defmfun accelerate-truncated (array levin)
   "gsl_sum_levin_utrunc_accel"
-  (((grid:foreign-pointer array) :pointer) ((dim0 array) sizet) ((mpointer levin) :pointer)
+  (((grid:foreign-pointer array) :pointer) ((dim0 array) :sizet) ((mpointer levin) :pointer)
    (accelerated-sum (:pointer :double)) (abserr (:pointer :double)))
   :inputs (array)
   :documentation			; FDL
diff --git a/series-struct.lisp b/series-struct.lisp
index 38fd3988539f4644cedfc90bc79cc0e6e0bc5a40..8580229bd9b6772b967e4a5f656f585d80194378 100644
--- a/series-struct.lisp
+++ b/series-struct.lisp
@@ -1,6 +1,6 @@
 ;; Define the structure for series
 ;; Liam Healy 2009-06-06 11:08:11EDT series-struct.lisp
-;; Time-stamp: <2010-05-23 11:37:50EDT series-struct.lisp>
+;; Time-stamp: <2012-01-13 12:01:19EST series-struct.lisp>
 ;;
 ;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,5 +31,5 @@
 (include "gsl/gsl_sum.h")
 
 (cstruct levin-c "gsl_sum_levin_u_workspace"
-	 (terms-used "terms_used" :type sizet)
+	 (terms-used "terms_used" :type :sizet)
 	 (sum-plain "sum_plain" :type :double))
diff --git a/solve-minimize-fit/linear-least-squares.lisp b/solve-minimize-fit/linear-least-squares.lisp
index 34bf23d2da7738bd9e277279e2a33eedef87b262..597c9658b1fc3367d34571f0e3e33933b7302de4 100644
--- a/solve-minimize-fit/linear-least-squares.lisp
+++ b/solve-minimize-fit/linear-least-squares.lisp
@@ -1,6 +1,6 @@
 ;; Linear least squares, or linear regression
 ;; Liam Healy <2008-01-21 12:41:46EST linear-least-squares.lisp>
-;; Time-stamp: <2011-10-23 21:55:39EDT linear-least-squares.lisp>
+;; Time-stamp: <2012-01-13 12:01:18EST linear-least-squares.lisp>
 ;;
 ;; Copyright 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -36,16 +36,16 @@
 (defmfun linear-fit
     (x y &optional weight (x-stride 1) (y-stride 1) (weight-stride 1))
   ("gsl_fit_linear" "gsl_fit_wlinear")
-  ((((grid:foreign-pointer x) :pointer) (x-stride sizet)
-    ((grid:foreign-pointer y) :pointer) (y-stride sizet)
-    ((dim0 x) sizet)
+  ((((grid:foreign-pointer x) :pointer) (x-stride :sizet)
+    ((grid:foreign-pointer y) :pointer) (y-stride :sizet)
+    ((dim0 x) :sizet)
     (c0 (:pointer :double)) (c1 (:pointer :double))
     (cov00 (:pointer :double)) (cov01 (:pointer :double))
     (cov11 (:pointer :double)) (sumsq (:pointer :double)))
-   (((grid:foreign-pointer x) :pointer) (x-stride sizet)
-    ((grid:foreign-pointer weight) :pointer) (weight-stride sizet)
-    ((grid:foreign-pointer y) :pointer) (y-stride sizet)
-    ((dim0 x) sizet)
+   (((grid:foreign-pointer x) :pointer) (x-stride :sizet)
+    ((grid:foreign-pointer weight) :pointer) (weight-stride :sizet)
+    ((grid:foreign-pointer y) :pointer) (y-stride :sizet)
+    ((dim0 x) :sizet)
     (c0 (:pointer :double)) (c1 (:pointer :double))
     (cov00 (:pointer :double)) (cov01 (:pointer :double))
     (cov11 (:pointer :double)) (sumsq (:pointer :double))))
@@ -85,15 +85,15 @@
 (defmfun multiplier-fit
     (x y &optional weight (x-stride 1) (y-stride 1) (weight-stride 1))
   ("gsl_fit_mul" "gsl_fit_wmul")
-  ((((grid:foreign-pointer x) :pointer) (x-stride sizet)
-    ((grid:foreign-pointer y) :pointer) (y-stride sizet)
-    ((dim0 x) sizet)
+  ((((grid:foreign-pointer x) :pointer) (x-stride :sizet)
+    ((grid:foreign-pointer y) :pointer) (y-stride :sizet)
+    ((dim0 x) :sizet)
     (c1 (:pointer :double)) (cov11 (:pointer :double))
     (sumsq (:pointer :double)))
-   (((grid:foreign-pointer x) :pointer) (x-stride sizet)
-    ((grid:foreign-pointer weight) :pointer) (weight-stride sizet)
-    ((grid:foreign-pointer y) :pointer) (y-stride sizet)
-    ((dim0 x) sizet)
+   (((grid:foreign-pointer x) :pointer) (x-stride :sizet)
+    ((grid:foreign-pointer weight) :pointer) (weight-stride :sizet)
+    ((grid:foreign-pointer y) :pointer) (y-stride :sizet)
+    ((dim0 x) :sizet)
     (c1 (:pointer :double)) (cov11 (:pointer :double))
     (sumsq (:pointer :double))))
   :inputs (x y weight)
@@ -127,7 +127,7 @@
 
 (defmobject fit-workspace
     "gsl_multifit_linear"
-  ((number-of-observations sizet) (number-of-parameters sizet))
+  ((number-of-observations :sizet) (number-of-parameters :sizet))
   "multi-dimensional root solver with function only"
   :documentation
   "Make a workspace for a multidimensional linear least-squares fit.")
@@ -230,7 +230,7 @@
   ((((mpointer model) :pointer)
     ((mpointer observations) :pointer)
     (tolerance :double)
-    (rank (:pointer sizet))
+    (rank (:pointer :sizet))
     ((mpointer parameters) :pointer)
     ((mpointer covariance) :pointer)
     (chisq (:pointer :double))
@@ -239,7 +239,7 @@
     ((mpointer weight) :pointer)
     ((mpointer observations) :pointer)
     (tolerance :double)
-    (rank (:pointer sizet))
+    (rank (:pointer :sizet))
     ((mpointer parameters) :pointer)
     ((mpointer covariance) :pointer)
     (chisq (:pointer :double))
@@ -247,7 +247,7 @@
   :inputs (model weight observations)
   :outputs (parameters covariance)
   :switch (weight)
-  :return ((cffi:mem-ref chisq :double) (cffi:mem-ref rank 'sizet))
+  :return ((cffi:mem-ref chisq :double) (cffi:mem-ref rank ':sizet))
   :export nil
   :index linear-mfit
   :documentation			; FDL
diff --git a/solve-minimize-fit/minimization-multi.lisp b/solve-minimize-fit/minimization-multi.lisp
index 90f984e56d4d6d1f57f519c8760f51859edc5172..4ca17c8af04fb75555c3847a28f3992c7d1012ee 100644
--- a/solve-minimize-fit/minimization-multi.lisp
+++ b/solve-minimize-fit/minimization-multi.lisp
@@ -1,6 +1,6 @@
 ;; Multivariate minimization.
 ;; Liam Healy  <Tue Jan  8 2008 - 21:28>
-;; Time-stamp: <2011-10-30 10:03:24EDT minimization-multi.lisp>
+;; Time-stamp: <2012-01-13 12:01:18EST minimization-multi.lisp>
 ;;
 ;; Copyright 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -44,7 +44,7 @@
 
 (defmobject multi-dimensional-minimizer-f
     "gsl_multimin_fminimizer"
-  ((type :pointer) ((first dimensions) sizet))
+  ((type :pointer) ((first dimensions) :sizet))
   "multi-dimensional minimizer with function only"
   :documentation			; FDL
   "Make an instance of a minimizer for a function of the given
@@ -63,7 +63,7 @@
 
 (defmobject multi-dimensional-minimizer-fdf
     "gsl_multimin_fdfminimizer"
-  ((type :pointer) ((first dimensions) sizet))
+  ((type :pointer) ((first dimensions) :sizet))
   "multi-dimensional minimizer with function and derivative"
   :documentation			; FDL
   "Make an instance of a minimizer for a function of the given
diff --git a/solve-minimize-fit/nonlinear-least-squares.lisp b/solve-minimize-fit/nonlinear-least-squares.lisp
index 6adcd3413f427a5c50bf201bffb5c078265a7730..2f399232ccf8ce577141ce18e744ee234c9e6f8c 100644
--- a/solve-minimize-fit/nonlinear-least-squares.lisp
+++ b/solve-minimize-fit/nonlinear-least-squares.lisp
@@ -1,6 +1,6 @@
 ;; Nonlinear least squares fitting.
 ;; Liam Healy, 2008-02-09 12:59:16EST nonlinear-least-squares.lisp
-;; Time-stamp: <2011-10-30 10:02:12EDT nonlinear-least-squares.lisp>
+;; Time-stamp: <2012-01-13 12:01:17EST nonlinear-least-squares.lisp>
 ;;
 ;; Copyright 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -31,8 +31,8 @@
 
 (defmobject nonlinear-ffit "gsl_multifit_fsolver"
   ((solver-type :pointer)
-   ((first dimensions) sizet)		; number-of-observations
-   ((second dimensions) sizet))		; number-of-parameters
+   ((first dimensions) :sizet)		; number-of-observations
+   ((second dimensions) :sizet))		; number-of-parameters
   "nonlinear least squares fit with function only"
   :documentation			; FDL
   "The number of observations must be greater than or equal to parameters."
@@ -61,8 +61,8 @@
 
 (defmobject nonlinear-fdffit "gsl_multifit_fdfsolver"
   ((solver-type :pointer)
-   ((first dimensions) sizet)		; number-of-observations
-   ((second dimensions) sizet))		; number-of-parameters
+   ((first dimensions) :sizet)		; number-of-observations
+   ((second dimensions) :sizet))		; number-of-parameters
   "nonlinear least squares fit with function and derivative"
   :documentation			; FDL
   "The number of observations must be greater than or
diff --git a/solve-minimize-fit/roots-multi.lisp b/solve-minimize-fit/roots-multi.lisp
index 84129ae7fc3371a1de12576bb94ccd5f5bb45847..305df4a77144f5b463ec230662b2487f1967f2c3 100644
--- a/solve-minimize-fit/roots-multi.lisp
+++ b/solve-minimize-fit/roots-multi.lisp
@@ -1,6 +1,6 @@
 ;;; Multivariate roots.                
 ;;; Liam Healy 2008-01-12 12:49:08
-;;; Time-stamp: <2011-10-30 10:02:55EDT roots-multi.lisp>
+;;; Time-stamp: <2012-01-13 12:01:17EST roots-multi.lisp>
 ;;
 ;; Copyright 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
 ;;;;****************************************************************************
 
 (defmobject multi-dimensional-root-solver-f "gsl_multiroot_fsolver"
-  ((type :pointer) ((first dimensions) sizet))
+  ((type :pointer) ((first dimensions) :sizet))
   "multi-dimensional root solver with function only"
   :documentation			; FDL
   "Make an instance of a solver of the type specified for a system of
@@ -60,7 +60,7 @@
   :inputs (initial))
 
 (defmobject multi-dimensional-root-solver-fdf "gsl_multiroot_fdfsolver"
-  ((type :pointer) ((first dimensions) sizet))
+  ((type :pointer) ((first dimensions) :sizet))
   "multi-dimensional root solver with function and derivative"
   :documentation			; FDL
   "Make an instance of a derivative solver of the type specified for
diff --git a/solve-minimize-fit/simulated-annealing.lisp b/solve-minimize-fit/simulated-annealing.lisp
index 31396b38be4a5e8b559dfc6e700dea4ad17a53ac..49b2c58cbc644d20d71a3ab2fe767874b96e9674 100644
--- a/solve-minimize-fit/simulated-annealing.lisp
+++ b/solve-minimize-fit/simulated-annealing.lisp
@@ -1,6 +1,6 @@
 ;; Simulated Annealing
 ;; Liam Healy Sun Feb 11 2007 - 17:23
-;; Time-stamp: <2011-10-30 09:40:23EDT simulated-annealing.lisp>
+;; Time-stamp: <2012-01-13 12:01:16EST simulated-annealing.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -186,7 +186,7 @@
    ((cffi:get-callback 'sa-copy-function) :pointer)
    ((cffi:get-callback 'sa-copy-constructor-function) :pointer)
    ((cffi:get-callback 'sa-destroy-function) :pointer)
-   (0 sizet)
+   (0 :sizet)
    (parameters (:struct simulated-annealing-parameters)))
   :c-return :void
   :export nil
diff --git a/sorting.lisp b/sorting.lisp
index 8cdc95088fdef1d107bb860fb31197f4d4edf884..1c6e7d167476e9d143ce8324d99c8e69a373a314 100644
--- a/sorting.lisp
+++ b/sorting.lisp
@@ -1,6 +1,6 @@
 ;; Sorting
 ;; Liam Healy, Fri Apr 14 2006 - 20:20
-;; Time-stamp: <2012-01-03 13:16:28EST sorting.lisp>
+;; Time-stamp: <2012-01-13 12:01:10EST sorting.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011, 2012 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
 
 (defmfun heapsort (array count size function)
   "gsl_heapsort"
-  ((array :pointer) (count sizet) (size sizet) (function :pointer))
+  ((array :pointer) (count :sizet) (size :sizet) (function :pointer))
   :documentation			; FDL
   "Sort the count elements of the array of size specified
    into ascending order using the comparison
@@ -46,7 +46,7 @@
 
 (defmfun heapsort-index (p array count size function)
   "gsl_heapsort_index"
-  ((p sizet) (array :pointer) (count sizet) (size sizet) (function :pointer))
+  ((p :sizet) (array :pointer) (count :sizet) (size :sizet) (function :pointer))
   :documentation			; FDL
   "Indirectly sort the count elements of the array
    array, each of size given, into ascending order using the
@@ -76,7 +76,7 @@
 
 (defmfun msort ((v both))
   ("gsl_sort" :type)
-  (((grid:foreign-pointer v) :pointer) (1 sizet) ((size v) sizet))
+  (((grid:foreign-pointer v) :pointer) (1 :sizet) ((size v) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :void
@@ -101,7 +101,7 @@
   ("gsl_sort" :type "_index")
   (((mpointer permutation) :pointer)
    ((grid:foreign-pointer vector) :pointer)
-   (1 sizet) ((dim0 vector) sizet))
+   (1 :sizet) ((dim0 vector) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :void
@@ -139,7 +139,7 @@
 
 (defmfun sort-vector-smallest (dest (v vector))
   ("gsl_sort_vector" :type "_smallest")
-  (((grid:foreign-pointer dest) :pointer) ((dim0 dest) sizet)
+  (((grid:foreign-pointer dest) :pointer) ((dim0 dest) :sizet)
    ((mpointer v) :pointer))
   :definition :generic
   :element-types :no-complex
@@ -152,10 +152,10 @@
 
 (defmfun sort-smallest (dest (v both))
   ("gsl_sort" :type "_smallest")
-  (((grid:foreign-pointer dest) :pointer) ((size dest) sizet)
+  (((grid:foreign-pointer dest) :pointer) ((size dest) :sizet)
    ((grid:foreign-pointer v) :pointer)
-   (1 sizet)				; stride, set to 1 for now
-   ((size v) sizet))
+   (1 :sizet)				; stride, set to 1 for now
+   ((size v) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :void
@@ -167,10 +167,10 @@
 
 (defmfun sort-vector-smallest-index (combination (v vector))
   ("gsl_sort_vector" :type "_smallest_index")
-  (((grid:foreign-pointer combination) :pointer) ((size combination) sizet)
+  (((grid:foreign-pointer combination) :pointer) ((size combination) :sizet)
    ((mpointer v) :pointer)
-   (1 sizet)				; stride, set to 1 for now
-   ((first (grid:dimensions combination)) sizet))
+   (1 :sizet)				; stride, set to 1 for now
+   ((first (grid:dimensions combination)) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :void
@@ -185,23 +185,23 @@
 
 (defmfun sort-smallest-index
     ((v vector) &optional (size-or-array 3)
-		&aux (combination (vdf size-or-array 'sizet)))
+		&aux (combination (vdf size-or-array ':sizet)))
   ("gsl_sort" :type "_smallest_index")
-  (((grid:foreign-pointer combination) :pointer) ((size combination) sizet)
+  (((grid:foreign-pointer combination) :pointer) ((size combination) :sizet)
    ((grid:foreign-pointer v) :pointer)
-   (1 sizet)				; stride, set to 1 for now
-   ((first (grid:dimensions v)) sizet))
+   (1 :sizet)				; stride, set to 1 for now
+   ((first (grid:dimensions v)) :sizet))
   :element-types :no-complex
   :definition :generic
   :c-return :void
   :inputs (v)
   :outputs (combination)
   :documentation
-  "The indices of the smallest elements of the vector.  If size-or-array is an integer, it is the number of smallest elements.  If it is an array of sizet elements, it is filled.")
+  "The indices of the smallest elements of the vector.  If size-or-array is an integer, it is the number of smallest elements.  If it is an array of :sizet elements, it is filled.")
 
 (defmfun sort-vector-largest (dest (v vector))
   ("gsl_sort_vector" :type "_largest")
-  (((grid:foreign-pointer dest) :pointer) ((dim0 dest) sizet)
+  (((grid:foreign-pointer dest) :pointer) ((dim0 dest) :sizet)
    ((mpointer v) :pointer))
   :definition :generic
   :element-types :no-complex
@@ -214,10 +214,10 @@
 
 (defmfun sort-largest (dest (v both))
   ("gsl_sort" :type "_largest")
-  (((grid:foreign-pointer dest) :pointer) ((size dest) sizet)
+  (((grid:foreign-pointer dest) :pointer) ((size dest) :sizet)
    ((grid:foreign-pointer v) :pointer)
-   (1 sizet)				; stride, set to 1 for now
-   ((size v) sizet))
+   (1 :sizet)				; stride, set to 1 for now
+   ((size v) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :void
@@ -229,10 +229,10 @@
 
 (defmfun sort-vector-largest-index (combination (v vector))
   ("gsl_sort_vector" :type "_largest_index")
-  (((grid:foreign-pointer combination) :pointer) ((size combination) sizet)
+  (((grid:foreign-pointer combination) :pointer) ((size combination) :sizet)
    ((mpointer v) :pointer)
-   (1 sizet)				; stride, set to 1 for now
-   ((first (grid:dimensions combination)) sizet))
+   (1 :sizet)				; stride, set to 1 for now
+   ((first (grid:dimensions combination)) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :void
@@ -247,12 +247,12 @@
 
 (defmfun sort-largest-index
     ((v vector) &optional (size-or-array 3)
-		&aux (combination (vdf size-or-array 'sizet)))
+		&aux (combination (vdf size-or-array ':sizet)))
   ("gsl_sort" :type "_largest_index")
-  (((grid:foreign-pointer combination) :pointer) ((size combination) sizet)
+  (((grid:foreign-pointer combination) :pointer) ((size combination) :sizet)
    ((grid:foreign-pointer v) :pointer)
-   (1 sizet)				; stride, set to 1 for now
-   ((first (grid:dimensions v)) sizet))
+   (1 :sizet)				; stride, set to 1 for now
+   ((first (grid:dimensions v)) :sizet))
   :element-types :no-complex
   :definition :generic
   :c-return :void
diff --git a/special-functions/airy.lisp b/special-functions/airy.lisp
index 2f3a3a178f9732c50c281d4bb596d90c2aa6914d..0a7eeec297a714c9ed10d5c8a9ddd48edd1624b1 100644
--- a/special-functions/airy.lisp
+++ b/special-functions/airy.lisp
@@ -1,6 +1,6 @@
 ;; Airy functions
 ;; Liam Healy, Fri Mar 17 2006 - 18:41
-;; Time-stamp: <2011-10-29 23:30:34EDT airy.lisp>
+;; Time-stamp: <2012-01-13 12:01:16EST airy.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -80,22 +80,22 @@
    exp(-(2/3) x^(3/2)), and is 1 for x<0.")
 
 (defmfun airy-zero-Ai (s)
-  "gsl_sf_airy_zero_Ai_e" ((s sizet) (ret (:pointer (:struct sf-result))))
+  "gsl_sf_airy_zero_Ai_e" ((s :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The location of the s-th zero of the Airy function Ai(x).")
 
 (defmfun airy-zero-Bi (s)
-  "gsl_sf_airy_zero_Bi_e" ((s sizet) (ret (:pointer (:struct sf-result))))
+  "gsl_sf_airy_zero_Bi_e" ((s :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The location of the s-th zero of the Airy function Bi(x).")
 
 (defmfun airy-zero-Ai-deriv (s)
-  "gsl_sf_airy_zero_Ai_deriv_e" ((s sizet) (ret (:pointer (:struct sf-result))))
+  "gsl_sf_airy_zero_Ai_deriv_e" ((s :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The location of the s-th zero of the Airy function derivative Ai'(x).")
 
 (defmfun airy-zero-Bi-deriv (s)
-  "gsl_sf_airy_zero_Bi_deriv_e" ((s sizet) (ret (:pointer (:struct sf-result))))
+  "gsl_sf_airy_zero_Bi_deriv_e" ((s :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The location of the s-th zero of the Airy function derivative Bi'(x).")
 
diff --git a/special-functions/gamma.lisp b/special-functions/gamma.lisp
index 17631eafa84be7dd9006c73133df8fa2dbe20d0e..f765e6ed1e2e9f91821ab8e97d2754bdb52674c7 100644
--- a/special-functions/gamma.lisp
+++ b/special-functions/gamma.lisp
@@ -1,6 +1,6 @@
 ;; Gamma functions
 ;; Liam Healy, Thu Apr 27 2006 - 22:06
-;; Time-stamp: <2011-11-24 22:42:00EST gamma.lisp>
+;; Time-stamp: <2012-01-13 12:01:16EST gamma.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -103,18 +103,18 @@
   "Compute the Taylor coefficient x^n / n! for x >= 0, n >= 0.")
 
 (defmfun factorial (n)
-  "gsl_sf_fact_e" ((n sizet) (ret (:pointer (:struct sf-result))))
+  "gsl_sf_fact_e" ((n :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The factorial n!, related to the Gamma function by n! = \Gamma(n+1).")
 
 (defmfun double-factorial (n)
-  "gsl_sf_doublefact_e" ((n sizet) (ret (:pointer (:struct sf-result))))
+  "gsl_sf_doublefact_e" ((n :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The double factorial n!! = n(n-2)(n-4) \dots.")
 
 (defmfun log-factorial (n)
   "gsl_sf_lnfact_e"
-  ((n sizet) (ret (:pointer (:struct sf-result))))
+  ((n :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The logarithm of the factorial of n, log(n!).
   The algorithm is faster than computing
@@ -122,19 +122,19 @@
 
 (defmfun log-double-factorial (n)
   "gsl_sf_lndoublefact_e"
-  ((n sizet) (ret (:pointer (:struct sf-result))))
+  ((n :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "Compute the logarithm of the double factorial of n, log(n!!).")
 
 (defmfun choose (n m)
   "gsl_sf_choose_e"
-  ((n sizet) (m sizet) (ret (:pointer (:struct sf-result))))
+  ((n :sizet) (m :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The combinatorial factor (n choose m) = n!/(m!(n-m)!).")
 
 (defmfun log-choose (n m)
   "gsl_sf_lnchoose_e"
-  ((n sizet) (m sizet) (ret (:pointer (:struct sf-result))))
+  ((n :sizet) (m :sizet) (ret (:pointer (:struct sf-result))))
   :documentation			; FDL
   "The logarithm of (n choose m).  This is
   equivalent to the sum log(n!) - log(m!) - log((n-m)!).")
diff --git a/special-functions/mathieu.lisp b/special-functions/mathieu.lisp
index 7d1b6133df58ab10cc4da737c74bb9edbe74f2c5..37ba631abba95410cda40cd58ffdeea208a45d88 100644
--- a/special-functions/mathieu.lisp
+++ b/special-functions/mathieu.lisp
@@ -1,6 +1,6 @@
 ;; Mathieu functions
 ;; Liam Healy 2009-02-16 16:30:59EST mathieu.lisp
-;; Time-stamp: <2011-10-29 23:29:25EDT mathieu.lisp>
+;; Time-stamp: <2012-01-13 12:01:15EST mathieu.lisp>
 ;;
 ;; Copyright 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
 ;;;;****************************************************************************
 
 (defmobject mathieu "gsl_sf_mathieu"
-  ((n sizet) (qmax :double))
+  ((n :sizet) (qmax :double))
   "workspace for Mathieu functions"
   :gsl-version (1 9)
   :documentation "Make a workspace needed for some Mathieu functions.")
diff --git a/special-functions/return-structures.lisp b/special-functions/return-structures.lisp
index 9b6b107013cf640d898d494ce8cb225fb4f6eefc..f6ad82274590f2320c98f3c6d7958418c0fedc32 100644
--- a/special-functions/return-structures.lisp
+++ b/special-functions/return-structures.lisp
@@ -1,6 +1,6 @@
 ;; Structures returned by special functions.
 ;; Liam Healy, Mon Jan  1 2007 - 11:35
-;; Time-stamp: <2012-01-03 13:16:46EST return-structures.lisp>
+;; Time-stamp: <2012-01-13 12:01:15EST return-structures.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009, 2010, 2011, 2012 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -67,7 +67,7 @@
   "Make or take a vector."
   (if (integerp size-or-array)
       (grid:make-foreign-array
-       (if (eq type 'sizet)
+       (if (eq type ':sizet)
 	   #+int64 '(unsigned-byte 64)
 	   #+int32 '(unsigned-byte 32)
 	   type)
diff --git a/statistics/absolute-deviation.lisp b/statistics/absolute-deviation.lisp
index 01381c34385186f6555f335928e79c54f2f3354e..0dd237f4b6149ded2fe472aab8fba65aa9cd4226 100644
--- a/statistics/absolute-deviation.lisp
+++ b/statistics/absolute-deviation.lisp
@@ -1,6 +1,6 @@
 ;; Absolute deviation
 ;; Liam Healy, Sun Dec 31 2006 - 13:19
-;; Time-stamp: <2011-01-10 17:59:33EST absolute-deviation.lisp>
+;; Time-stamp: <2012-01-13 12:01:14EST absolute-deviation.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -26,8 +26,8 @@
 (defmfun absolute-deviation ((data vector) &optional mean)
   (("gsl_stats" :type "_absdev")
    ("gsl_stats" :type "_absdev_m"))
-  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet))
-   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet)
+  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet))
+   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet)
     (mean :double)))
   :definition :generic
   :element-types :no-complex
@@ -50,10 +50,10 @@
    ("gsl_stats" :type "_wabsdev_m"))
   ((((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer data) :pointer) (1 :int)
-    ((dim0 data) sizet))
+    ((dim0 data) :sizet))
    (((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer data) :pointer) (1 :int)
-    ((dim0 data) sizet) (mean :double)))
+    ((dim0 data) :sizet) (mean :double)))
   :definition :generic
   :element-types :float
   :c-return :double
diff --git a/statistics/autocorrelation.lisp b/statistics/autocorrelation.lisp
index dc04aea517dd9839fb2f099c89de8ba6cf4e62f8..91a62e2019778dddefa19d258932367807320773 100644
--- a/statistics/autocorrelation.lisp
+++ b/statistics/autocorrelation.lisp
@@ -1,6 +1,6 @@
 ;; Autocorrelation
 ;; Liam Healy, Sun Dec 31 2006 - 13:19
-;; Time-stamp: <2011-01-10 17:59:34EST autocorrelation.lisp>
+;; Time-stamp: <2012-01-13 12:01:14EST autocorrelation.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -26,8 +26,8 @@
 (defmfun autocorrelation ((data vector) &optional mean)
   (("gsl_stats" :type "_lag1_autocorrelation")
    ("gsl_stats" :type "_lag1_autocorrelation_m"))
-  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet))
-   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet)
+  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet))
+   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet)
     (mean :double)))
   :definition :generic
   :element-types :no-complex
diff --git a/statistics/covariance.lisp b/statistics/covariance.lisp
index c1b79f16bc4d472d9e4f2781c7f1617bb8fa9a7c..3e1e793f2c4b39b5f881223b66881fd7769a10eb 100644
--- a/statistics/covariance.lisp
+++ b/statistics/covariance.lisp
@@ -1,6 +1,6 @@
 ;; Covariance
 ;; Liam Healy, Sun Dec 31 2006 - 13:19
-;; Time-stamp: <2011-01-10 17:59:34EST covariance.lisp>
+;; Time-stamp: <2012-01-13 12:01:13EST covariance.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -28,9 +28,9 @@
   (("gsl_stats" :type "_covariance")
    ("gsl_stats" :type "_covariance_m"))
   ((((grid:foreign-pointer data1) :pointer) (1 :int)
-    ((grid:foreign-pointer data2) :pointer) (1 :int) ((dim0 data2) sizet))
+    ((grid:foreign-pointer data2) :pointer) (1 :int) ((dim0 data2) :sizet))
    (((grid:foreign-pointer data1) :pointer) (1 :int)
-    ((grid:foreign-pointer data2) :pointer) (1 :int) ((dim0 data2) sizet)
+    ((grid:foreign-pointer data2) :pointer) (1 :int) ((dim0 data2) :sizet)
     (mean1 :double) (mean2 :double)))
   :definition :generic
   :element-types :no-complex
@@ -45,7 +45,7 @@
 (defmfun correlation ((data1 vector) (data2 vector))
   ("gsl_stats" :type "_correlation")
   (((grid:foreign-pointer data1) :pointer) (1 :int)
-    ((grid:foreign-pointer data2) :pointer) (1 :int) ((dim0 data2) sizet))
+    ((grid:foreign-pointer data2) :pointer) (1 :int) ((dim0 data2) :sizet))
   :definition :generic
   :gsl-version (1 10)
   :element-types :no-complex
diff --git a/statistics/higher-moments.lisp b/statistics/higher-moments.lisp
index 5dcab44deefa56696aca500fbc560a043f66bd06..4efcab89cac876bf95446f3b3fd673fe32e1cf24 100644
--- a/statistics/higher-moments.lisp
+++ b/statistics/higher-moments.lisp
@@ -1,6 +1,6 @@
 ;; Skewness and kurtosis.
 ;; Liam Healy, Sun Dec 31 2006 - 14:20
-;; Time-stamp: <2011-01-10 17:59:34EST higher-moments.lisp>
+;; Time-stamp: <2012-01-13 12:01:13EST higher-moments.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -25,8 +25,8 @@
 (defmfun skewness ((data vector) &optional mean standard-deviation)
   (("gsl_stats" :type "_skew")
    ("gsl_stats" :type "_skew_m_sd"))
-  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet))
-   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet)
+  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet))
+   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet)
     (mean :double) (standard-deviation :double)))
   :definition :generic
   :element-types :no-complex
@@ -45,8 +45,8 @@
 (defmfun kurtosis ((data vector) &optional mean standard-deviation)
   (("gsl_stats" :type "_kurtosis")
    ("gsl_stats" :type "_kurtosis_m_sd"))
-  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet))
-   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) sizet)
+  ((((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet))
+   (((grid:foreign-pointer data) :pointer) (1 :int) ((dim0 data) :sizet)
     (mean :double) (standard-deviation :double)))
   :definition :generic
   :element-types :no-complex
@@ -65,10 +65,10 @@
    ("gsl_stats" :type "_wskew_m_sd"))
   ((((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer data) :pointer) (1 :int)
-    ((dim0 data) sizet))
+    ((dim0 data) :sizet))
    (((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer data) :pointer) (1 :int)
-    ((dim0 data) sizet)
+    ((dim0 data) :sizet)
     (mean :double) (standard-deviation :double)))
   :definition :generic
   :element-types :float
@@ -84,10 +84,10 @@
    ("gsl_stats" :type "_wkurtosis_m_sd"))
   ((((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer data) :pointer) (1 :int)
-    ((dim0 data) sizet))
+    ((dim0 data) :sizet))
    (((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer data) :pointer) (1 :int)
-    ((dim0 data) sizet)
+    ((dim0 data) :sizet)
     (mean :double) (standard-deviation :double)))
   :definition :generic
   :element-types :float
diff --git a/statistics/mean-variance.lisp b/statistics/mean-variance.lisp
index a0d7a81e85595c2506b65141561c37ca92d82f13..ad4a03719b6b1716827a2a722e28615b3bc20754 100644
--- a/statistics/mean-variance.lisp
+++ b/statistics/mean-variance.lisp
@@ -1,6 +1,6 @@
 ;; Mean, standard deviation, and variance    
 ;; Liam Healy, Sat Dec  2 2006 - 22:15
-;; Time-stamp: <2011-05-26 12:37:30EDT mean-variance.lisp>
+;; Time-stamp: <2012-01-13 12:01:12EST mean-variance.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 
 (defmfun mean ((array both))
   ("gsl_stats" :type "_mean")
-  (((grid:foreign-pointer array) :pointer) (1 :int) ((size array) sizet))
+  (((grid:foreign-pointer array) :pointer) (1 :int) ((size array) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :double
@@ -43,7 +43,7 @@
   ("gsl_stats" :type "_wmean")
   (((grid:foreign-pointer weights) :pointer) (1 :int)
    ((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet))
+   ((size array) :sizet))
   :definition :generic
   :element-types :float
   :c-return :element-c-type
@@ -60,9 +60,9 @@
 (defmfun variance ((array both) &optional mean)
   (("gsl_stats" :type "_variance")
    ("gsl_stats" :type "_variance_m"))
-  ((((grid:foreign-pointer array) :pointer) (1 :int) ((size array) sizet))
+  ((((grid:foreign-pointer array) :pointer) (1 :int) ((size array) :sizet))
    (((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet) (mean :double)))
+   ((size array) :sizet) (mean :double)))
   :definition :generic
   :element-types :no-complex
   :c-return :double
@@ -84,10 +84,10 @@
    ("gsl_stats" :type "_wvariance_m"))
   ((((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer array) :pointer) (1 :int)
-    ((size array) sizet))
+    ((size array) :sizet))
    (((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer array) :pointer) (1 :int)
-    ((size array) sizet) (mean :double)))
+    ((size array) :sizet) (mean :double)))
   :definition :generic
   :element-types :float
   :c-return :double
@@ -108,9 +108,9 @@
 (defmfun standard-deviation ((array both) &optional mean)
   (("gsl_stats" :type "_sd")
    ("gsl_stats" :type "_sd_m"))
-  ((((grid:foreign-pointer array) :pointer) (1 :int) ((size array) sizet))
+  ((((grid:foreign-pointer array) :pointer) (1 :int) ((size array) :sizet))
    (((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet) (mean :double)))
+   ((size array) :sizet) (mean :double)))
   :definition :generic
   :element-types :no-complex
   :c-return :double
@@ -125,10 +125,10 @@
    ("gsl_stats" :type "_wsd_m"))
   ((((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer array) :pointer) (1 :int)
-    ((size array) sizet))
+    ((size array) :sizet))
    (((grid:foreign-pointer weights) :pointer) (1 :int)
     ((grid:foreign-pointer array) :pointer) (1 :int)
-    ((size array) sizet) (mean :double)))
+    ((size array) :sizet) (mean :double)))
   :definition :generic
   :element-types :float
   :c-return :double
@@ -145,7 +145,7 @@
 (defmfun variance-with-fixed-mean ((array both) mean)
   ("gsl_stats" :type "_variance_with_fixed_mean")
   (((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet) (mean :double))
+   ((size array) :sizet) (mean :double))
   :definition :generic
   :element-types :no-complex
   :c-return :double
@@ -161,7 +161,7 @@
 (defmfun standard-deviation-with-fixed-mean ((array both) mean)
   ("gsl_stats" :type "_sd_with_fixed_mean")
   (((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet) (mean :double))
+   ((size array) :sizet) (mean :double))
   :definition :generic
   :element-types :no-complex
   :c-return :double
@@ -180,7 +180,7 @@
   ("gsl_stats" :type "_wvariance_with_fixed_mean")
   (((grid:foreign-pointer weights) :pointer) (1 :int)
    ((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet) (mean :double))
+   ((size array) :sizet) (mean :double))
   :definition :generic
   :element-types :float
   :c-return :double
@@ -198,7 +198,7 @@
   ("gsl_stats" :type "_wsd_with_fixed_mean")
   (((grid:foreign-pointer weights) :pointer) (1 :int)
    ((grid:foreign-pointer array) :pointer) (1 :int)
-   ((size array) sizet) (mean :double))
+   ((size array) :sizet) (mean :double))
   :definition :generic
   :element-types :float
   :c-return :double
diff --git a/statistics/median-percentile.lisp b/statistics/median-percentile.lisp
index 67eb56bcca3e098690fb1a9e33baabbb541bc1a6..aa5eeeb16c3f0fe0b43f171001b07d8a3cec4744 100644
--- a/statistics/median-percentile.lisp
+++ b/statistics/median-percentile.lisp
@@ -1,6 +1,6 @@
 ;; Median and percentile
 ;; Liam Healy, Sun Dec 31 2006 - 13:19
-;; Time-stamp: <2011-01-10 17:59:35EST median-percentile.lisp>
+;; Time-stamp: <2012-01-13 12:01:12EST median-percentile.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
 
 (defmfun median ((sorted-data vector))
   ("gsl_stats" :type "_median_from_sorted_data")
-  (((grid:foreign-pointer sorted-data) :pointer) (1 :int) ((dim0 sorted-data) sizet))
+  (((grid:foreign-pointer sorted-data) :pointer) (1 :int) ((dim0 sorted-data) :sizet))
   :definition :generic
   :element-types :no-complex
   :c-return :double
@@ -44,7 +44,7 @@
 
 (defmfun quantile ((sorted-data vector) fraction)
   ("gsl_stats" :type "_quantile_from_sorted_data")
-  (((grid:foreign-pointer sorted-data) :pointer) (1 :int) ((dim0 sorted-data) sizet)
+  (((grid:foreign-pointer sorted-data) :pointer) (1 :int) ((dim0 sorted-data) :sizet)
    (fraction :double))
   :definition :generic
   :element-types :no-complex
diff --git a/wavelet.lisp b/wavelet.lisp
index 1ab3aac38604b790569d96bd4ee825310c28b612..6b02bc6dd5853be40c31d28ebd8d830181cf09f2 100644
--- a/wavelet.lisp
+++ b/wavelet.lisp
@@ -1,6 +1,6 @@
 ;; Wavelet transforms.
 ;; Liam Healy, Mon Nov 26 2007 - 20:43
-;; Time-stamp: <2011-05-26 12:37:28EDT wavelet.lisp>
+;; Time-stamp: <2012-01-13 12:01:10EST wavelet.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -37,7 +37,7 @@
 ;;;;****************************************************************************
 
 (defmobject wavelet "gsl_wavelet"
-  ((type :pointer) (member sizet))
+  ((type :pointer) (member :sizet))
   "wavelet"
   :documentation			; FDL
   "Make and initialize a wavelet object of type 'type.  The
@@ -89,7 +89,7 @@
 
 (defmobject wavelet-workspace
   "gsl_wavelet_workspace"
-  ((size sizet))
+  ((size :sizet))
   "wavelet workspace"
   :documentation			; FDL
   "Make a workspace for the discrete wavelet transform.
@@ -106,7 +106,7 @@
 (defmfun wavelet-transform (wavelet data stride direction workspace)
   "gsl_wavelet_transform"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (stride sizet) ((dim0 data) sizet) ((forward-backward direction) :int)
+   (stride :sizet) ((dim0 data) :sizet) ((forward-backward direction) :int)
    ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute in-place forward and inverse discrete wavelet
@@ -132,7 +132,7 @@
 (defmfun wavelet-transform-forward (wavelet data stride workspace)
   "gsl_wavelet_transform_forward"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (stride sizet) ((dim0 data) sizet) ((mpointer workspace) :pointer))
+   (stride :sizet) ((dim0 data) :sizet) ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute in-place forward and inverse discrete wavelet
    transforms on the array data.  The length of the transform
@@ -154,7 +154,7 @@
 (defmfun wavelet-transform-inverse (wavelet data stride workspace)
   "gsl_wavelet_transform_inverse"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (stride sizet) ((dim0 data) sizet) ((mpointer workspace) :pointer))
+   (stride :sizet) ((dim0 data) :sizet) ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute in-place inverse discrete wavelet
    transforms on the array data.  The length of the transform
@@ -180,7 +180,7 @@
 (defmfun wavelet-2d-transform (wavelet data tda direction workspace)
   "gsl_wavelet2d_transform"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (tda sizet) ((dim0 data) sizet) ((dim1 data) sizet)
+   (tda :sizet) ((dim0 data) :sizet) ((dim1 data) :sizet)
    ((forward-backward direction) :int) ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute in-place forward and inverse discrete wavelet transforms
@@ -200,7 +200,7 @@
 (defmfun wavelet-2d-transform-forward (wavelet data tda workspace)
   "gsl_wavelet2d_transform_forward"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (tda sizet) ((dim0 data) sizet) ((dim1 data) sizet)
+   (tda :sizet) ((dim0 data) :sizet) ((dim1 data) :sizet)
    ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute two-dimensional in-place forward and inverse
@@ -218,7 +218,7 @@
 (defmfun wavelet-2d-transform-inverse (wavelet data tda workspace)
   "gsl_wavelet2d_transform_inverse"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (tda sizet) ((dim0 data) sizet) ((dim1 data) sizet)
+   (tda :sizet) ((dim0 data) :sizet) ((dim1 data) :sizet)
    ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute two-dimensional in-place forward and inverse discrete
@@ -255,7 +255,7 @@
 (defmfun wavelet-2d-nonstandard-transform (wavelet data tda direction workspace)
   "gsl_wavelet2d_nstransform"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (tda sizet) ((dim0 data) sizet) ((dim1 data) sizet) (direction :int)
+   (tda :sizet) ((dim0 data) :sizet) ((dim1 data) :sizet) (direction :int)
    ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute the two-dimensional wavelet transform in non-standard form.")
@@ -263,7 +263,7 @@
 (defmfun wavelet-2d-nonstandard-transform-forward (wavelet data tda workspace)
   "gsl_wavelet2d_nstransform_forward"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (tda sizet) ((dim0 data) sizet) ((dim1 data) sizet)
+   (tda :sizet) ((dim0 data) :sizet) ((dim1 data) :sizet)
    ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute the two-dimensional wavelet transform in non-standard form.")
@@ -271,7 +271,7 @@
 (defmfun wavelet-2d-nonstandard-transform-inverse (wavelet data tda workspace)
   "gsl_wavelet2d_nstransform_inverse"
   (((mpointer wavelet) :pointer) ((grid:foreign-pointer data) :pointer)
-   (tda sizet) ((dim0 data) sizet) ((dim1 data) sizet)
+   (tda :sizet) ((dim0 data) :sizet) ((dim1 data) :sizet)
    ((mpointer workspace) :pointer))
   :documentation			; FDL
   "Compute the two-dimensional wavelet transform in non-standard form.")