[PATCH 1/2] Try to get these types right.