Extend Makefile, fix ArrayDeclarator bug,

find new bug. Apparently I need to do something different about the statements
to distinguish them from blocks.