diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 1d3c5e6ac..5f28e95f3 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -650,17 +650,17 @@ emit_function (function_t *f, expr_t *e)
 int
 function_parms (function_t *f, byte *parm_size)
 {
-	//FIXME this is icky
 	int         count, i;
+	ty_func_t  *func = &f->sym->type->t.func;
 
-	if (f->sym->type->t.func.num_params >= 0)
-		count = f->sym->type->t.func.num_params;
+	if (func->num_params >= 0)
+		count = func->num_params;
 	else
-		count = -f->sym->type->t.func.num_params - 1;
+		count = -func->num_params - 1;
 
 	for (i = 0; i < count; i++)
-		parm_size[i] = type_size (f->sym->type->t.func.param_types[i]);
-	return f->sym->type->t.func.num_params;
+		parm_size[i] = type_size (func->param_types[i]);
+	return func->num_params;
 }
 
 void
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index 8fcab1728..13e70cb07 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -252,7 +252,7 @@ static void
 free_operand (operand_t *op)
 {
 	if (op->next) {
-		//FIXME this should be an error, but due to the way operands are use,
+		//FIXME this should be an error, but due to the way operands are used,
 		//it can happen.
 		debug (0, "free_operand: double free");
 		return;