removed level of indirection around T_FUN + misc fixes