diff --git a/TODO b/TODO
index 0f4f411..4c032c5 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 Extensions on existing code:
 * bfile:     implement the optimization-restart as realized by Kbd2
-* kernel:    use GINT_CALL() for all callbacks, without breaking the timer API
 * kernel:    better restore to userspace before panic (ensure BL=0 IMASK=0)
 * project:   add license file
 * kernel:    group linker script symbols in a single header file
diff --git a/include/gint/dma.h b/include/gint/dma.h
index fb499e1..ee36918 100644
--- a/include/gint/dma.h
+++ b/include/gint/dma.h
@@ -55,7 +55,7 @@ typedef enum
    @dst_mode  Destination address mode
    @callback  Function to invoke when the transfer finishes
    -> Returns true on success. */
-bool dma_transfer_async(int channel, dma_size_t size, uint length,
+bool dma_transfer_async(int channel, dma_size_t size, uint blocks,
 	void const *src, dma_address_t src_mode, void *dst,
 	dma_address_t dst_mode, gint_call_t callback);
 
@@ -65,7 +65,7 @@ void dma_transfer_wait(int channel);
 
 /* dma_transfer_sync(): Perform an synchronous DMA data transfer
    Like dma_transfer_async(), but only returns once the transfer completes. */
-bool dma_transfer_sync(int channel, dma_size_t size, uint length,
+bool dma_transfer_sync(int channel, dma_size_t size, uint blocks,
 	void const *src, dma_address_t src_mode, void *dst,
 	dma_address_t dst_mode);
 
@@ -81,7 +81,7 @@ void dma_transfer_atomic(int channel, dma_size_t size, uint blocks,
 
 /* Deprecated version of dma_transfer_async() that did not have a callback */
 __attribute__((deprecated("Use dma_transfer_async() instead")))
-void dma_transfer(int channel, dma_size_t size, uint length, void const *src,
+void dma_transfer(int channel, dma_size_t size, uint blocks, void const *src,
 	dma_address_t src_mode, void *dst, dma_address_t dst_mode);
 /* Old name for dma_transfer_atomic() */
 #define dma_transfer_noint dma_transfer_atomic
diff --git a/include/gint/timer.h b/include/gint/timer.h
index 77c4e77..7864ce8 100644
--- a/include/gint/timer.h
+++ b/include/gint/timer.h
@@ -13,7 +13,7 @@
 /* Timer types and numbers
 
    If you're new to timers, read this comment and then check timer_configure()
- timer_start(): most of the time you only need these.
+   and timer_start(): most of the time you only need these.
 
    There are two types of timers on the calculator: normal timers called TMU,
    and extra timers added by Casio called ETMU. The main difference is that TMU