Added make target for heap-flexible
Changed from C99-style in-statement declaration of variables