* GCC 4.7 is more picky than GCC 4.6, so have to make changes accordingly * Changes include addressing issues with scoping, redeclaration, etc. Thanks Rene and Ingo for your input on these changes