More incremental work on funcdecl